BSD 4_4 release

[unix-history] / usr / src / usr.sbin / amd / amd / opts.c

diff --git a/usr/src/usr.sbin/amd/amd/opts.c b/usr/src/usr.sbin/amd/amd/opts.c
index 204fef4..54c9675 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/opts.c
+++ b/usr/src/usr.sbin/amd/amd/opts.c
@@ -1,20 +1,47 @@
-/*
+/*-

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine

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

  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * %sccs.include.redist.c%
- *
- *     @(#)opts.c      1.3 (Berkeley) 6/26/91
+ * 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.

  *
  *

- * $Id: opts.c,v 5.2.2.1 1992/02/09 15:08:54 jsp beta $
+ * 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.

  *
  *

+ * $Id: opts.c,v 5.2.2.3 1992/05/31 16:34:13 jsp Exp $

  */
 
  */
 

+#ifndef lint
+static char sccsid[] = "@(#)opts.c     8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+

 #include "am.h"
 
 extern char *getenv P((const char *));
 #include "am.h"
 
 extern char *getenv P((const char *));


@@ -320,11 +347,12 @@ void normalize_slash(p)
 char *p;
 {
        char *f = strchr(p, '/');
 char *p;
 {
        char *f = strchr(p, '/');

+       char *f0 = f;

        if (f) {
                char *t = f;
                do {
                        /* assert(*f == '/'); */
        if (f) {
                char *t = f;
                do {
                        /* assert(*f == '/'); */

-                       if (f == t && f[0] == '/' && f[1] == '/') {
+                       if (f == f0 && f[0] == '/' && f[1] == '/') {

                                /* copy double slash iff first */
                                *t++ = *f++;
                                *t++ = *f++;
                                /* copy double slash iff first */
                                *t++ = *f++;
                                *t++ = *f++;


@@ -340,9 +368,9 @@ char *p;
 
                        /* assert(*f != '/'); */
                        /* keep copying up to next / */
 
                        /* assert(*f != '/'); */
                        /* keep copying up to next / */

-                       do {
+                       while (*f && *f != '/') {

                                *t++ = *f++;
                                *t++ = *f++;

-                       } while (*f && *f != '/');
+                       }

 
                        /* assert(*f == 0 || *f == '/'); */
 
 
                        /* assert(*f == 0 || *f == '/'); */