tools/cmdline.diff

   1 --- gliv/src/cmdline.c.orig
   2 +++ gliv/src/cmdline.c
   3 @@ -79,7 +79,12 @@
   4  char *
   5  gengetopt_strdup (const char *s)
   6  {
   7 -  char *result = (char*)malloc(strlen(s) + 1);
   8 +  char *result;
   9 +
  10 +  if (s == (char*)0)
  11 +    return (char*)0;
  12 +
  13 +  result = (char*)malloc(strlen(s) + 1);
  14    if (result == (char*)0)
  15      return (char*)0;
  16    strcpy(result, s);
  17 @@ -170,39 +175,39 @@
  18          { "help",      0, NULL, 'h' },
  19          { "version",   0, NULL, 'V' },
  20          { "duration",  1, NULL, 'a' },
  21 -        { "menu",      1, NULL, 'b' },
  22 -        { "client",    1, NULL, 'C' },
  23 -        { "alpha-checks",      1, NULL, 'c' },
  24 +        { "menu",      2, NULL, 'b' },
  25 +        { "client",    2, NULL, 'C' },
  26 +        { "alpha-checks",      2, NULL, 'c' },
  27          { "delay",     1, NULL, 'd' },
  28 -        { "build-menus",       1, NULL, 'e' },
  29 -        { "force-load",        1, NULL, 'F' },
  30 -        { "full-screen",       1, NULL, 'f' },
  31 -        { "glivrc",    1, NULL, 'g' },
  32 -        { "info",      1, NULL, 'i' },
  33 -        { "loop",      1, NULL, 'L' },
  34 -        { "scale-down",        1, NULL, 'l' },
  35 -        { "maximize",  1, NULL, 'M' },
  36 -        { "make-fit",  1, NULL, 'm' },
  37 -        { "mnemonics", 1, NULL, 'n' },
  38 -        { "scrollbars",        1, NULL, 'o' },
  39 +        { "build-menus",       2, NULL, 'e' },
  40 +        { "force-load",        2, NULL, 'F' },
  41 +        { "full-screen",       2, NULL, 'f' },
  42 +        { "glivrc",    2, NULL, 'g' },
  43 +        { "info",      2, NULL, 'i' },
  44 +        { "loop",      2, NULL, 'L' },
  45 +        { "scale-down",        2, NULL, 'l' },
  46 +        { "maximize",  2, NULL, 'M' },
  47 +        { "make-fit",  2, NULL, 'm' },
  48 +        { "mnemonics", 2, NULL, 'n' },
  49 +        { "scrollbars",        2, NULL, 'o' },
  50          { "fps",       1, NULL, 'P' },
  51 -        { "mipmap",    1, NULL, 'p' },
  52 -        { "recursive", 1, NULL, 'R' },
  53 -        { "sort",      1, NULL, 'S' },
  54 -        { "shuffle",   1, NULL, 's' },
  55 -        { "thumbnails",        1, NULL, 'T' },
  56 -        { "dither",    1, NULL, 't' },
  57 +        { "mipmap",    2, NULL, 'p' },
  58 +        { "recursive", 2, NULL, 'R' },
  59 +        { "sort",      2, NULL, 'S' },
  60 +        { "shuffle",   2, NULL, 's' },
  61 +        { "thumbnails",        2, NULL, 'T' },
  62 +        { "dither",    2, NULL, 't' },
  63          { "history",   1, NULL, 'u' },
  64 -        { "resize-win",        1, NULL, 'W' },
  65 -        { "slide-show",        1, NULL, 'w' },
  66 -        { "zoom-pointer",      1, NULL, 'z' },
  67 -        { "null",      1, NULL, '0' },
  68 -        { "one-image", 1, NULL, '1' },
  69 +        { "resize-win",        2, NULL, 'W' },
  70 +        { "slide-show",        2, NULL, 'w' },
  71 +        { "zoom-pointer",      2, NULL, 'z' },
  72 +        { "null",      2, NULL, '0' },
  73 +        { "one-image", 2, NULL, '1' },
  74          { NULL,        0, NULL, 0 }
  75        };
  76
  77        stop_char = 0;
  78 -      c = getopt_long (argc, argv, "hVa:b:C:c:d:e:F:f:g:i:L:l:M:m:n:o:P:p:R:S:s:T:t:u:W:w:z:0:1:", long_options, &option_index);
  79 +      c = getopt_long (argc, argv, "hVa:b::C::c::d:e::F::f::g::i::L::l::M::m::n::o::P:p::R::S::s::T::t::u:W::w::z::0::1::", long_options, &option_index);
  80
  81        if (c == -1) break;      /* Exit from `while (1)' loop.  */
  82