ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.114 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.115 by ayin, Tue Oct 9 15:23:59 2007 UTC

547 * default values 547 * default values
548 */ 548 */
549 549
550 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 { 551 {
552 if (flag == resval_on && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
554 554
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
565 } 565 }
566 else 566 else
567#ifdef KEYSYM_RESOURCE 567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 569 {
570 const char *str = argv[++i]; 570 if (i+1 < argc)
571
572 if (str != NULL)
573 parse_keysym (opt + sizeof ("keysym.") - 1, str); 571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
574 } 572 }
575 else 573 else
576#endif 574#endif
577 { 575 {
578 bad_option = 1; 576 bad_option = 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines