=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsdiff.c,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/rcs/rcsdiff.c 2005/10/12 17:43:18 1.10 --- src/usr.bin/rcs/rcsdiff.c 2005/10/13 12:35:30 1.11 *************** *** 1,4 **** ! /* $OpenBSD: rcsdiff.c,v 1.10 2005/10/12 17:43:18 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcsdiff.c,v 1.11 2005/10/13 12:35:30 joris Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. *************** *** 52,58 **** rev2 = NULL; status = 0; ! while ((ch = getopt(argc, argv, "cnqr:uV")) != -1) { switch (ch) { case 'c': diff_format = D_CONTEXT; --- 52,58 ---- rev2 = NULL; status = 0; ! while ((ch = rcs_getopt(argc, argv, "cnqr:uV")) != -1) { switch (ch) { case 'c': diff_format = D_CONTEXT; *************** *** 71,94 **** exit(0); case 'r': if (rev == RCS_HEAD_REV) { ! if ((rev = rcsnum_parse(optarg)) == NULL) { cvs_log(LP_ERR, "bad revision number"); exit(1); } } else { ! if ((rev2 = rcsnum_parse(optarg)) == NULL) { cvs_log(LP_ERR, "bad revision number"); exit(1); } } break; default: ! break; } } ! argc -= optind; ! argv += optind; if (argc == 0) { cvs_log(LP_ERR, "no input file"); --- 71,95 ---- exit(0); case 'r': if (rev == RCS_HEAD_REV) { ! if ((rev = rcsnum_parse(rcs_optarg)) == NULL) { cvs_log(LP_ERR, "bad revision number"); exit(1); } } else { ! if ((rev2 = rcsnum_parse(rcs_optarg)) == NULL) { cvs_log(LP_ERR, "bad revision number"); exit(1); } } break; default: ! (usage)(); ! exit (1); } } ! argc -= rcs_optind; ! argv += rcs_optind; if (argc == 0) { cvs_log(LP_ERR, "no input file");