Commit 55ad781c authored by Wei Jiangang's avatar Wei Jiangang Committed by Paolo Bonzini
Browse files

use g_path_get_dirname instead of dirname 



Use g_path_get_basename to get the directory components of
a file name, and free its return when no longer needed.

Signed-off-by: default avatarWei Jiangang <weijg.fnst@cn.fujitsu.com>
Message-Id: <1459997185-15669-3-git-send-email-weijg.fnst@cn.fujitsu.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6b92bbfe

os-posix.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ char *os_find_datadir(void) 
    if (exec_dir == NULL) {

        return NULL;

    }

    dir = dirname(exec_dir);

    dir = g_path_get_dirname(exec_dir);



    max_len = strlen(dir) +

        MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;
@@ -103,6 +103,7 @@ char *os_find_datadir(void) 
        }

    }



    g_free(dir);

    g_free(exec_dir);

    return res;

}

util/oslib-posix.c

+3 −1
Original line number Diff line number Diff line
@@ -299,9 +299,11 @@ void qemu_init_exec_dir(const char *argv0) 
            return;

        }

    }

    dir = dirname(p);

    dir = g_path_get_dirname(p);



    pstrcpy(exec_dir, sizeof(exec_dir), dir);



    g_free(dir);

}



char *qemu_get_exec_dir(void)