2c2
< Copyright (C) 1989-1998 Free Software Foundation, Inc.
---
> Copyright (C) 1989-1998, 2000 Free Software Foundation, Inc.
45a46,48
> /* Default struct initializer suffix. */
> static const char *const DEFAULT_INITIALIZER_SUFFIX = "";
>
69a73
> const char *Options::initializer_suffix;
82c86
< fprintf (strm, "Usage: %s [-cCdDef[num]GhH<hashname>i<init>Ijk<keys>K<keyname>lL<language>nN<function name>ors<size>S<switches>tTvW<wordlistname>Z<class name>7] [input-file]\n"
---
> fprintf (strm, "Usage: %s [-cCdDef[num]F<initializers>GhH<hashname>i<init>Ijk<keys>K<keyname>lL<language>nN<function name>ors<size>S<switches>tTvW<wordlistname>Z<class name>7] [input-file]\n"
118a123,125
> " -F, --initializer-suffix=INITIALIZERS\n"
> " Initializers for additional components in the keyword\n"
> " structure.\n"
225c232,233
< printf ("%s ", argument_vector[i]);
---
> {
> const char *arg = argument_vector[i];
226a235,276
> /* Escape arg if it contains shell metacharacters. */
> if (*arg == '-')
> {
> putchar (*arg);
> arg++;
> if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z')
> {
> putchar (*arg);
> arg++;
> }
> }
> if (strpbrk (arg, "\t\n !\"#$&'()*;<>?[\\]`{|}~") != NULL)
> {
> if (strchr (arg, '\'') != NULL)
> {
> putchar ('"');
> for (; *arg; arg++)
> {
> if (*arg == '\"' || *arg == '\\' || *arg == '$')
> putchar ('\\');
> putchar (*arg);
> }
> putchar ('"');
> }
> else
> {
> putchar ('\'');
> for (; *arg; arg++)
> {
> if (*arg == '\\')
> putchar ('\\');
> putchar (*arg);
> }
> putchar ('\'');
> }
> }
> else
> printf ("%s", arg);
>
> printf (" ");
> }
>
268a319
> initializer_suffix = DEFAULT_INITIALIZER_SUFFIX;
311a363
> "\ninitializer suffix = %s"
340c392,393
< jump, size - 1, initial_asso_value, delimiters, total_switches);
---
> initializer_suffix, jump, size - 1, initial_asso_value,
> delimiters, total_switches);
365a419
> { "initializer-suffix", required_argument, 0, 'F' },
406c460
< "adcCDe:Ef:gGhH:i:Ij:k:K:lL:nN:oprs:S:tTvW:Z:7",
---
> "adcCDe:Ef:F:gGhH:i:Ij:k:K:lL:nN:oprs:S:tTvW:Z:7",
455a510,514
> case 'F':
> {
> initializer_suffix = /*getopt*/optarg;
> break;
> }
460c519
< option_word |= GLOBAL;
---
> option_word |= GLOBAL;