BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / gen / fstab.c

diff --git a/usr/src/lib/libc/gen/fstab.c b/usr/src/lib/libc/gen/fstab.c
index 5c31acb..dd5ea63 100644 (file)
--- a/usr/src/lib/libc/gen/fstab.c
+++ b/usr/src/lib/libc/gen/fstab.c
@@ -3,20 +3,22 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED

- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)fstab.c    5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)fstab.c    5.11 (Berkeley) 6/1/90";

 #endif /* LIBC_SCCS and not lint */
 
 #include <fstab.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <fstab.h>


@@ -30,15 +32,18 @@ static
 fstabscan()
 {
        register char *cp;
 fstabscan()
 {
        register char *cp;

-#define        MAXLINELENGTH   100
+#define        MAXLINELENGTH   1024

        static char line[MAXLINELENGTH];
        char subline[MAXLINELENGTH];
        char *fgets(), *strtok();
        static char line[MAXLINELENGTH];
        char subline[MAXLINELENGTH];
        char *fgets(), *strtok();

+       int typexx;

 
        for (;;) {
                if (!(cp = fgets(line, sizeof(line), _fs_fp)))
                        return(0);
                _fs_fstab.fs_spec = strtok(cp, " \t\n");
 
        for (;;) {
                if (!(cp = fgets(line, sizeof(line), _fs_fp)))
                        return(0);
                _fs_fstab.fs_spec = strtok(cp, " \t\n");

+               if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
+                       continue;

                _fs_fstab.fs_file = strtok((char *)NULL, " \t\n");
                _fs_fstab.fs_vfstype = strtok((char *)NULL, " \t\n");
                _fs_fstab.fs_mntops = strtok((char *)NULL, " \t\n");
                _fs_fstab.fs_file = strtok((char *)NULL, " \t\n");
                _fs_fstab.fs_vfstype = strtok((char *)NULL, " \t\n");
                _fs_fstab.fs_mntops = strtok((char *)NULL, " \t\n");


@@ -52,7 +57,7 @@ fstabscan()
                                _fs_fstab.fs_passno = atoi(cp);
                }
                strcpy(subline, _fs_fstab.fs_mntops);
                                _fs_fstab.fs_passno = atoi(cp);
                }
                strcpy(subline, _fs_fstab.fs_mntops);

-               for (cp = strtok(subline, ","); cp;
+               for (typexx = 0, cp = strtok(subline, ","); cp;

                     cp = strtok((char *)NULL, ",")) {
                        if (strlen(cp) != 2)
                                continue;
                     cp = strtok((char *)NULL, ",")) {
                        if (strlen(cp) != 2)
                                continue;


@@ -74,9 +79,12 @@ fstabscan()
                        }
                        if (!strcmp(cp, FSTAB_XX)) {
                                _fs_fstab.fs_type = FSTAB_XX;
                        }
                        if (!strcmp(cp, FSTAB_XX)) {
                                _fs_fstab.fs_type = FSTAB_XX;

+                               typexx++;

                                break;
                        }
                }
                                break;
                        }
                }

+               if (typexx)
+                       continue;

                if (cp != NULL)
                        return(1);
        bad:
                if (cp != NULL)
                        return(1);
        bad: