Module Name: src
Committed By: msaitoh
Date: Thu Aug 7 06:22:35 UTC 2014
Modified Files:
src/external/bsd/cron/dist [netbsd-6]: entry.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1087):
external/bsd/cron/dist/entry.c: revision 1.5
PR/48944: cron ignores '?' (question mark) time field
Fix the obvious merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/bsd/cron/dist/entry.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/cron/dist/entry.c
diff -u src/external/bsd/cron/dist/entry.c:1.4 src/external/bsd/cron/dist/entry.c:1.4.8.1
--- src/external/bsd/cron/dist/entry.c:1.4 Thu Jul 15 20:03:28 2010
+++ src/external/bsd/cron/dist/entry.c Thu Aug 7 06:22:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: entry.c,v 1.4 2010/07/15 20:03:28 christos Exp $ */
+/* $NetBSD: entry.c,v 1.4.8.1 2014/08/07 06:22:35 msaitoh Exp $ */
/*
* Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -26,7 +26,7 @@
#if 0
static char rcsid[] = "Id: entry.c,v 1.17 2004/01/23 18:56:42 vixie Exp";
#else
-__RCSID("$NetBSD: entry.c,v 1.4 2010/07/15 20:03:28 christos Exp $");
+__RCSID("$NetBSD: entry.c,v 1.4.8.1 2014/08/07 06:22:35 msaitoh Exp $");
#endif
#endif
@@ -479,7 +479,6 @@ get_range(bitstr_t *bits, int low, int h
if (ch == EOF)
return (EOF);
} else if (ch == '?') {
- } else if (ch == '?') {
qmark = TRUE;
ch = get_char(file);
if (ch == EOF)
