[src/trunk]: src/external/bsd/cron/dist PR/48944: cron ignores '?' (question ...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/98e038d3e679
branches:  trunk
changeset: 796895:98e038d3e679
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jun 24 09:17:54 2014 +0000

description:
PR/48944: cron ignores '?' (question mark) time field

Fix the obvious merge botch.

diffstat:

 external/bsd/cron/dist/entry.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 177ec38ca6a6 -r 98e038d3e679 external/bsd/cron/dist/entry.c
--- a/external/bsd/cron/dist/entry.c    Tue Jun 24 07:28:23 2014 +0000
+++ b/external/bsd/cron/dist/entry.c    Tue Jun 24 09:17:54 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: entry.c,v 1.4 2010/07/15 20:03:28 christos Exp $       */
+/*     $NetBSD: entry.c,v 1.5 2014/06/24 09:17:54 skrll 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.5 2014/06/24 09:17:54 skrll Exp $");
 #endif
 #endif
 
@@ -479,7 +479,6 @@
                if (ch == EOF)
                        return (EOF);
        } else if (ch == '?') {
-       } else if (ch == '?') {
                qmark = TRUE;
                ch = get_char(file);
                if (ch == EOF)