Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/usr.bin/at Pull up revision 1.1 (new file, requested by...



details:   https://anonhg.NetBSD.org/src/rev/7d790b1ed7a1
branches:  netbsd-1-5
changeset: 490612:7d790b1ed7a1
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 03 21:03:15 2001 +0000

description:
Pull up revision 1.1 (new file, requested by kleink):
  Support the 1003.2-92 -t option.  Fixes PR#11205.
  For symmetry, extend -t to batch(1) as well.

diffstat:

 usr.bin/at/stime.c |  124 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 usr.bin/at/stime.h |   36 +++++++++++++++
 2 files changed, 160 insertions(+), 0 deletions(-)

diffs (168 lines):

diff -r 0dcf85eed412 -r 7d790b1ed7a1 usr.bin/at/stime.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/at/stime.c        Sat Feb 03 21:03:15 2001 +0000
@@ -0,0 +1,124 @@
+/*     $NetBSD: stime.c,v 1.2.2.2 2001/02/03 21:03:15 he Exp $ */
+
+/*
+ * Copyright (c) 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1993\n\
+       The Regents of the University of California.  All rights reserved.\n");
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "from: @(#)touch.c      8.2 (Berkeley) 4/28/95";
+#endif
+__RCSID("$NetBSD");
+#endif /* not lint */
+
+
+#include <err.h>
+#include <string.h>
+#include <time.h>
+#include <tzfile.h>
+
+#include "stime.h"
+
+#define        ATOI2(s)        ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
+
+time_t
+stime(arg)
+       char *arg;
+{
+       struct tm *t;
+       time_t tmptime;
+       int yearset;
+       char *p;
+                                       /* Start with the current time. */
+       if (time(&tmptime) == (time_t)-1)
+               err(1, "time");
+
+       if ((t = localtime(&tmptime)) == NULL)
+               err(1, "localtime");
+                                       /* [[CC]YY]MMDDhhmm[.SS] */
+       if ((p = strchr(arg, '.')) == NULL)
+               t->tm_sec = 0;          /* Seconds defaults to 0. */
+       else {
+               if (strlen(p + 1) != 2)
+                       goto terr;
+               *p++ = '\0';
+               t->tm_sec = ATOI2(p);
+       }
+               
+       yearset = 0;
+       switch (strlen(arg)) {
+       case 12:                        /* CCYYMMDDhhmm */
+               t->tm_year = ATOI2(arg) * 100 - TM_YEAR_BASE;
+               yearset = 1;
+               /* FALLTHOUGH */
+       case 10:                        /* YYMMDDhhmm */
+               if (yearset) {
+                       t->tm_year += ATOI2(arg);
+               } else {
+                       yearset = ATOI2(arg);
+                       if (yearset < 69)
+                               t->tm_year = yearset + 2000 - TM_YEAR_BASE;
+                       else
+                               t->tm_year = yearset + 1900 - TM_YEAR_BASE;
+               }
+               /* FALLTHROUGH */
+       case 8:                         /* MMDDhhmm */
+               t->tm_mon = ATOI2(arg);
+               --t->tm_mon;            /* Convert from 01-12 to 00-11 */
+               /* FALLTHROUGH */
+       case 6:
+               t->tm_mday = ATOI2(arg);
+               /* FALLTHROUGH */
+       case 4:
+               t->tm_hour = ATOI2(arg);
+               /* FALLTHROUGH */
+       case 2:
+               t->tm_min = ATOI2(arg);
+               break;
+       default:
+               goto terr;
+       }
+
+       t->tm_isdst = -1;               /* Figure out DST. */
+       tmptime = mktime(t);
+       if (tmptime == (time_t)-1)
+terr:          errx(1,
+       "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]");
+
+       return (tmptime);
+}
diff -r 0dcf85eed412 -r 7d790b1ed7a1 usr.bin/at/stime.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/at/stime.h        Sat Feb 03 21:03:15 2001 +0000
@@ -0,0 +1,36 @@
+/*     $NetBSD: stime.h,v 1.1.2.2 2001/02/03 21:03:15 he Exp $ */
+
+/*
+ * Copyright (c) 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+time_t stime __P((char *));



Home | Main Index | Thread Index | Old Index