[src/netbsd-6]: src/external/bsd/cron/dist Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/43cdfa9cddb6
branches:  netbsd-6
changeset: 776671:43cdfa9cddb6
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Aug 07 06:22:35 2014 +0000

description:
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.

diffstat:

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

diffs (26 lines):

diff -r 4727d460f9dc -r 43cdfa9cddb6 external/bsd/cron/dist/entry.c
--- a/external/bsd/cron/dist/entry.c    Fri Jul 18 17:52:30 2014 +0000
+++ b/external/bsd/cron/dist/entry.c    Thu Aug 07 06:22:35 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.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 @@
                if (ch == EOF)
                        return (EOF);
        } else if (ch == '?') {
-       } else if (ch == '?') {
                qmark = TRUE;
                ch = get_char(file);
                if (ch == EOF)