From 9d1057469485739c9a2563cf7c88fd2debc1e730 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 27 Aug 2012 00:20:48 +0300 Subject: [PATCH] replaced stdndup() with the inlined equivalent don't kill the OS incompatibility messenger. 1) http://stackoverflow.com/questions/6062822/whats-wrong-with-strndup stdndup() is POSIX 2008, but apparently not available on OSX and Windows it could be made potentially application global (e.g. a local "stdndup.h") 2) free() memory at pointer "current_dir", once we are done. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Linus Torvalds --- gtk-gui.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gtk-gui.c b/gtk-gui.c index a536c15..04b7af1 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -175,6 +175,8 @@ static void file_open(GtkWidget *w, gpointer data) /* return the path and the file component contained in the full path */ static char *path_and_file(char *pathin, char **fileout) { char *slash = pathin, *next; + char *result; + size_t len, n; if (! pathin) { *fileout = strdup(""); @@ -185,7 +187,19 @@ static char *path_and_file(char *pathin, char **fileout) { if (pathin != slash) slash++; *fileout = strdup(slash); - return strndup(pathin, slash - pathin); + + /* strndup(pathin, slash - pathin) */ + n = slash - pathin; + len = strlen(pathin); + if (n < len) + len = n; + + result = (char *)malloc(len + 1); + if (!result) + return 0; + + result[len] = '\0'; + return (char *)memcpy(result, pathin, len); } static void file_save_as(GtkWidget *w, gpointer data) @@ -206,6 +220,9 @@ static void file_save_as(GtkWidget *w, gpointer data) current_dir = path_and_file(existing_filename, ¤t_file); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), current_dir); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), current_file); + + free(current_dir); + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); } -- 2.45.2