BSD 4_4 release

[unix-history] / usr / src / usr.sbin / sendmail / src / convtime.c

diff --git a/usr/src/usr.sbin/sendmail/src/convtime.c b/usr/src/usr.sbin/sendmail/src/convtime.c
index d99bfe1..5cb5e49 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/convtime.c
+++ b/usr/src/usr.sbin/sendmail/src/convtime.c
@@ -1,13 +1,39 @@
 /*
  * Copyright (c) 1983 Eric P. Allman
 /*
  * Copyright (c) 1983 Eric P. Allman

- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)convtime.c 5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)convtime.c 8.1 (Berkeley) 6/7/93";

 #endif /* not lint */
 
 # include <ctype.h>
 #endif /* not lint */
 
 # include <ctype.h>


@@ -27,6 +53,7 @@ static char sccsid[] = "@(#)convtime.c        5.4 (Berkeley) %G%";
 **
 **     Parameters:
 **             p -- pointer to ascii time.
 **
 **     Parameters:
 **             p -- pointer to ascii time.

+**             units -- default units if none specified.

 **
 **     Returns:
 **             time in seconds.
 **
 **     Returns:
 **             time in seconds.


@@ -36,8 +63,9 @@ static char sccsid[] = "@(#)convtime.c        5.4 (Berkeley) %G%";
 */
 
 time_t
 */
 
 time_t

-convtime(p)
+convtime(p, units)

        char *p;
        char *p;

+       char units;

 {
        register time_t t, r;
        register char c;
 {
        register time_t t, r;
        register char c;


@@ -46,10 +74,13 @@ convtime(p)
        while (*p != '\0')
        {
                t = 0;
        while (*p != '\0')
        {
                t = 0;

-               while (isdigit(c = *p++))
+               while ((c = *p++) != '\0' && isascii(c) && isdigit(c))

                        t = t * 10 + (c - '0');
                if (c == '\0')
                        t = t * 10 + (c - '0');
                if (c == '\0')

+               {
+                       c = units;

                        p--;
                        p--;

+               }

                switch (c)
                {
                  case 'w':             /* weeks */
                switch (c)
                {
                  case 'w':             /* weeks */