diff options
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/src/emacs.c b/src/emacs.c index 4de567a5588..e4c42c3e193 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1358,27 +1358,17 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem /* If we have the form --display=NAME, convert it into -d name. This requires inserting a new element into argv. */ - if (displayname != 0 && skip_args - count_before == 1) + if (displayname && count_before < skip_args) { - char **new; - int j; - - if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (char *) - 2 < argc) - memory_full (SIZE_MAX); - new = (char **) xmalloc (sizeof *new * argc + sizeof *new * 2); - for (j = 0; j < count_before + 1; j++) - new[j] = argv[j]; - new[count_before + 1] = (char *) "-d"; - new[count_before + 2] = displayname; - for (j = count_before + 2; j <argc; j++) - new[j + 1] = argv[j]; - argv = new; - argc++; + if (skip_args == count_before + 1) + { + memmove (argv + count_before + 3, argv + count_before + 2, + (argc - (count_before + 2)) * sizeof *argv); + argv[count_before + 2] = displayname; + argc++; + } + argv[count_before + 1] = (char *) "-d"; } - /* Change --display to -d, when its arg is separate. */ - else if (displayname != 0 && skip_args > count_before - && argv[count_before + 1][1] == '-') - argv[count_before + 1] = (char *) "-d"; if (! no_site_lisp) { @@ -1841,19 +1831,13 @@ sort_args (int argc, char **argv) 0 for an option that takes no arguments, 1 for an option that takes one argument, etc. -1 for an ordinary non-option argument. */ - int *options; - int *priority; + int *options = xnmalloc (argc, sizeof *options); + int *priority = xnmalloc (argc, sizeof *priority); int to = 1; int incoming_used = 1; int from; int i; - if (sizeof (char *) < sizeof (int) - && min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) < argc) - memory_full (SIZE_MAX); - options = (int *) xmalloc (sizeof (int) * argc); - priority = (int *) xmalloc (sizeof (int) * argc); - /* Categorize all the options, and figure out which argv elts are option arguments. */ for (from = 1; from < argc; from++) |