masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 03:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacsclient: getopt minor cleanup

Browse source 
* lib-src/emacsclient.c (shortopts): New constant.
(decode_options): Use it.  Do not assume EOF == -1.
This commit is contained in:
Paul Eggert 2018-11-21 18:37:44 -08:00
parent 0f22bf099e
commit ad063d2552
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib-src/emacsclient.c
View file

@ -153,6 +153,7 @@ static char const *frame_parameters;
static _Noreturn void print_help_and_exit (void);
/* Long command-line options. */
static struct option const longopts[] =
{
@ -177,6 +178,15 @@ static struct option const longopts[] =
{ 0, 0, 0, 0 }
};
/* Short options, in the same order as the corresponding long options.
There is no '-p' short option. */
static char const shortopts[] =
"nqueHVtca:F:"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"s:"
#endif
"f:d:T:";
/* Like malloc but get fatal error if memory is exhausted. */
@ -485,15 +495,8 @@ decode_options (int argc, char **argv)
while (true)
{
int opt = getopt_long_only (argc, argv,
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"VHnequa:s:f:d:F:tcT:",
#else
"VHnequa:f:d:F:tcT:",
#endif
longopts, 0);
if (opt == EOF)
int opt = getopt_long_only (argc, argv, shortopts, longopts, NULL);
if (opt < 0)
break;
switch (opt)