From 54a9eb416d4f0f564928db18e4bfe34c847c20a8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 14 Mar 1998 07:16:36 +0000 Subject: [PATCH] Don't leave NULL's in argv. Sat Mar 14 02:12:44 1998 Owen Taylor * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gdk/gdk.c | 6 ------ gdk/x11/gdkmain-x11.c | 6 ------ gtk/gtkmain.c | 23 ++++++++++++++++------- 10 files changed, 44 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0faaeda7e6..6eca5a947d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Sat Mar 14 02:12:44 1998 Owen Taylor + + * gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv. + Sat Mar 14 01:36:51 1998 Owen Taylor * gtk-config.in: Added -I $exec_prefix/glib/include to cflags diff --git a/gdk/gdk.c b/gdk/gdk.c index 3e203cab29..24167e8f7c 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -311,12 +311,6 @@ gdk_init (int *argc, for (i = 1; i < *argc;) { - if ((*argv)[i] == NULL) - { - i += 1; - continue; - } - #ifdef G_ENABLE_DEBUG if (strcmp ("--gdk-debug", (*argv)[i]) == 0) { diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 3e203cab29..24167e8f7c 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -311,12 +311,6 @@ gdk_init (int *argc, for (i = 1; i < *argc;) { - if ((*argv)[i] == NULL) - { - i += 1; - continue; - } - #ifdef G_ENABLE_DEBUG if (strcmp ("--gdk-debug", (*argv)[i]) == 0) { diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index d007c3950c..d45eab5c5f 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -204,16 +204,10 @@ gtk_init (int *argc, if (argc && argv) { - gint i; + gint i, j, k; for (i = 1; i < *argc;) { - if ((*argv)[i] == NULL) - { - i += 1; - continue; - } - if (strcmp ("--gtk-debug", (*argv)[i]) == 0) { (*argv)[i] = NULL; @@ -242,6 +236,21 @@ gtk_init (int *argc, } i += 1; } + + for (i = 1; i < *argc; i++) + { + for (k = i; k < *argc; k++) + if ((*argv)[k] != NULL) + break; + + if (k > i) + { + k -= i; + for (j = i + k; j < *argc; j++) + (*argv)[j-k] = (*argv)[j]; + *argc -= k; + } + } } #endif /* G_ENABLE_DEBUG */