include fixes

SCCS-vsn: lib/libc/gen/closedir.c 4.5
SCCS-vsn: lib/libc/gen/ctime.c 4.3
SCCS-vsn: lib/libc/gen/opendir.c 4.5
SCCS-vsn: lib/libc/gen/readdir.c 4.5
SCCS-vsn: lib/libc/gen/scandir.c 4.2
SCCS-vsn: lib/libc/gen/seekdir.c 4.10
SCCS-vsn: lib/libc/gen/sleep.c 4.4
SCCS-vsn: lib/libc/gen/telldir.c 4.5
SCCS-vsn: lib/libc/gen/valloc.c 4.3

diff --git a/usr/src/lib/libc/gen/closedir.c b/usr/src/lib/libc/gen/closedir.c
index 93ee9e4..bfbd291 100644 (file)
--- a/usr/src/lib/libc/gen/closedir.c
+++ b/usr/src/lib/libc/gen/closedir.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-static char sccsid[] = "@(#)closedir.c 4.4 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)closedir.c 4.5 (Berkeley) %G%";
+#endif

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 /*
  * close a directory.
 
 /*
  * close a directory.

diff --git a/usr/src/lib/libc/gen/ctime.c b/usr/src/lib/libc/gen/ctime.c
index e4ae598..5d2db22 100644 (file)
--- a/usr/src/lib/libc/gen/ctime.c
+++ b/usr/src/lib/libc/gen/ctime.c
@@ -1,4 +1,6 @@
-/* @(#)ctime.c 4.2 (Berkeley) %G% */
+#ifndef lint
+static char sccsid[] = "@(#)ctime.c    4.3 (Berkeley) %G%";
+#endif

 /*
  * This routine converts time as follows.
  * The epoch is 0000 Jan 1 1970 GMT.
 /*
  * This routine converts time as follows.
  * The epoch is 0000 Jan 1 1970 GMT.


@@ -35,7 +37,7 @@
  * ctime(t) just calls localtime, then asctime.
  */
 
  * ctime(t) just calls localtime, then asctime.
  */
 

-#include <time.h>
+#include <sys/time.h>

 #include <sys/types.h>
 #include <sys/timeb.h>
 
 #include <sys/types.h>
 #include <sys/timeb.h>
 

diff --git a/usr/src/lib/libc/gen/opendir.c b/usr/src/lib/libc/gen/opendir.c
index e2ad197..05d32a7 100644 (file)
--- a/usr/src/lib/libc/gen/opendir.c
+++ b/usr/src/lib/libc/gen/opendir.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-static char sccsid[] = "@(#)opendir.c 4.4 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)opendir.c  4.5 (Berkeley) %G%";
+#endif

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 /*
  * open a directory.
 
 /*
  * open a directory.

diff --git a/usr/src/lib/libc/gen/readdir.c b/usr/src/lib/libc/gen/readdir.c
index 58f05ea..1010e02 100644 (file)
--- a/usr/src/lib/libc/gen/readdir.c
+++ b/usr/src/lib/libc/gen/readdir.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-static char sccsid[] = "@(#)readdir.c 4.4 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)readdir.c  4.5 (Berkeley) %G%";
+#endif

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 /*
  * get next entry in a directory.
 
 /*
  * get next entry in a directory.

diff --git a/usr/src/lib/libc/gen/scandir.c b/usr/src/lib/libc/gen/scandir.c
index f00b8b4..44c693c 100644 (file)
--- a/usr/src/lib/libc/gen/scandir.c
+++ b/usr/src/lib/libc/gen/scandir.c
@@ -1,4 +1,7 @@
-/*     scandir.c       4.1     82/12/13        */
+#ifndef lint
+static char sccsid[] = "@(#)scandir.c  4.2 (Berkeley) %G%";
+#endif
+

 /*
  * Scan the directory dirname calling select to make a list of selected
  * directory entries then sort using qsort and compare routine dcomp.
 /*
  * Scan the directory dirname calling select to make a list of selected
  * directory entries then sort using qsort and compare routine dcomp.


@@ -8,7 +11,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 scandir(dirname, namelist, select, dcomp)
        char *dirname;
 
 scandir(dirname, namelist, select, dcomp)
        char *dirname;

diff --git a/usr/src/lib/libc/gen/seekdir.c b/usr/src/lib/libc/gen/seekdir.c
index 4f830d3..7046984 100644 (file)
--- a/usr/src/lib/libc/gen/seekdir.c
+++ b/usr/src/lib/libc/gen/seekdir.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-static char sccsid[] = "@(#)seekdir.c 4.9 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)seekdir.c  4.10 (Berkeley) %G%";
+#endif

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 /*
  * seek to an entry in a directory.
 
 /*
  * seek to an entry in a directory.

diff --git a/usr/src/lib/libc/gen/sleep.c b/usr/src/lib/libc/gen/sleep.c
index 4405e5f..a3d2cad 100644 (file)
--- a/usr/src/lib/libc/gen/sleep.c
+++ b/usr/src/lib/libc/gen/sleep.c
@@ -1,8 +1,10 @@
-/*     @(#)sleep.c     4.3 (Berkeley) %G%      */
+#ifndef lint
+static char sccsid[] = "@(#)sleep.c    4.4 (Berkeley) %G%";
+#endif

 
 

+#include <sys/time.h>

 #include <signal.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <setjmp.h>

-#include <time.h>

 
 static jmp_buf jmp;
 
 
 static jmp_buf jmp;
 

diff --git a/usr/src/lib/libc/gen/telldir.c b/usr/src/lib/libc/gen/telldir.c
index 2b79f55..63ed8ba 100644 (file)
--- a/usr/src/lib/libc/gen/telldir.c
+++ b/usr/src/lib/libc/gen/telldir.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-static char sccsid[] = "@(#)telldir.c 4.4 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)telldir.c  4.5 (Berkeley) %G%";
+#endif

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <dir.h>
+#include <sys/dir.h>

 
 /*
  * return a pointer into a directory
 
 /*
  * return a pointer into a directory

diff --git a/usr/src/lib/libc/gen/valloc.c b/usr/src/lib/libc/gen/valloc.c
index e36cd58..3fefc43 100644 (file)
--- a/usr/src/lib/libc/gen/valloc.c
+++ b/usr/src/lib/libc/gen/valloc.c
@@ -1,4 +1,6 @@
-/*     valloc.c        4.2     83/07/01        */
+#ifndef lint
+static char sccsid[] = "@(#)valloc.c   4.3 (Berkeley) %G%";
+#endif

 
 char   *malloc();
 
 
 char   *malloc();
 


@@ -7,7 +9,7 @@ valloc(i)
        int i;
 {
        int valsiz = getpagesize(), j;
        int i;
 {
        int valsiz = getpagesize(), j;

-       char *cp = malloc(i + (valsize-1));
+       char *cp = malloc(i + (valsiz-1));

 
        j = ((int)cp + (valsiz-1)) &~ (valsiz-1);
        return ((char *)j);
 
        j = ((int)cp + (valsiz-1)) &~ (valsiz-1);
        return ((char *)j);