[BACK]Return to fstab.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libc / gen

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libc/gen/fstab.c between version 1.1 and 1.8

version 1.1, 1993/03/21 09:45:37 version 1.8, 1996/04/03 19:48:56
Line 1 
Line 1 
   /*      $NetBSD$        */
   
 /*  /*
  * Copyright (c) 1980, 1988 Regents of the University of California.   * Copyright (c) 1980, 1988, 1993
  * All rights reserved.   *      The Regents of the University of California.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 32 
Line 34 
  */   */
   
 #if defined(LIBC_SCCS) && !defined(lint)  #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fstab.c     5.15 (Berkeley) 2/23/91";  #if 0
   static char sccsid[] = "@(#)fstab.c     8.1 (Berkeley) 6/4/93";
   #else
   static char rcsid[] = "$NetBSD$";
   #endif
 #endif /* LIBC_SCCS and not lint */  #endif /* LIBC_SCCS and not lint */
   
 #include <sys/errno.h>  #include <sys/types.h>
   #include <sys/uio.h>
   #include <errno.h>
 #include <fstab.h>  #include <fstab.h>
 #include <unistd.h>  
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>
   #include <unistd.h>
   
 static FILE *_fs_fp;  static FILE *_fs_fp;
 static struct fstab _fs_fstab;  static struct fstab _fs_fstab;
 static error();  
   
 static  static void error __P((int));
   static int fstabscan __P((void));
   
   static int
 fstabscan()  fstabscan()
 {  {
         register char *cp;          register char *cp;
Line 61  fstabscan()
Line 71  fstabscan()
 /* OLD_STYLE_FSTAB */  /* OLD_STYLE_FSTAB */
                 if (!strpbrk(cp, " \t")) {                  if (!strpbrk(cp, " \t")) {
                         _fs_fstab.fs_spec = strtok(cp, ":\n");                          _fs_fstab.fs_spec = strtok(cp, ":\n");
                           if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
                                   continue;
                         _fs_fstab.fs_file = strtok((char *)NULL, ":\n");                          _fs_fstab.fs_file = strtok((char *)NULL, ":\n");
                         _fs_fstab.fs_type = strtok((char *)NULL, ":\n");                          _fs_fstab.fs_type = strtok((char *)NULL, ":\n");
                         if (_fs_fstab.fs_type) {                          if (_fs_fstab.fs_type) {
Line 164  getfsfile(name)
Line 176  getfsfile(name)
         return((struct fstab *)NULL);          return((struct fstab *)NULL);
 }  }
   
   int
 setfsent()  setfsent()
 {  {
         if (_fs_fp) {          if (_fs_fp) {
Line 185  endfsent()
Line 198  endfsent()
         }          }
 }  }
   
 static  static void
 error(err)  error(err)
         int err;          int err;
 {  {
         char *p;          struct iovec iov[5];
   
         (void)write(STDERR_FILENO, "fstab: ", 7);          iov[0].iov_base = "fstab: ";
         (void)write(STDERR_FILENO, _PATH_FSTAB, sizeof(_PATH_FSTAB) - 1);          iov[0].iov_len = 7;
         p = strerror(err);          iov[1].iov_base = _PATH_FSTAB;
         (void)write(STDERR_FILENO, p, strlen(p));          iov[1].iov_len = sizeof(_PATH_FSTAB) - 1;
         (void)write(STDERR_FILENO, "\n", 1);          iov[2].iov_base =  ": ";
           iov[2].iov_len = 2;
           iov[3].iov_base = strerror(err);
           iov[3].iov_len = strlen(iov[3].iov_base);
           iov[4].iov_base = "\n";
           iov[4].iov_len = 1;
           (void)writev(STDERR_FILENO, iov, 5);
 }  }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.8
CVSweb <webmaster@jp.NetBSD.org>