Changeset 900 for vendor/gnumake/current/arscan.c

Timestamp:

May 23, 2007, 5:13:11 AM (18 years ago)

Author:

bird

Message:

Load /home/bird/src/Gnu/make/2007-05-23 into vendor/gnumake/current.

File:

• vendor/gnumake/current/arscan.c (modified) (24 diffs)

vendor/gnumake/current/arscan.c

@@ -26 +26 @@
 
 #ifndef NO_ARCHIVES
-
 
 #ifdef VMS
@@ -136 +135 @@
 
 long int
-ar_scan (char *archive, long int (*function) PARAMS ((void)), long int arg)
+ar_scan (const char *archive, ar_member_func_t function, const void *arg)
 {
   char *p;
@@ -304 +303 @@
 
 long int
-ar_scan (char *archive, long int (*function)(), long int arg)
+ar_scan (const char *archive, ar_member_func_t function, const void *arg)
 {
 #ifdef AIAMAG
@@ -316 +315 @@
 #endif
   char *namemap = 0;
-  register int desc = open (archive, O_RDONLY, 0);
+  int desc = open (archive, O_RDONLY, 0);
   if (desc < 0)
     return -1;
@@ -323 +322 @@
     char buf[SARMAG];
     register int nread = read (desc, buf, SARMAG);
-    if (nread != SARMAG || bcmp (buf, ARMAG, SARMAG))
+    if (nread != SARMAG || memcmp (buf, ARMAG, SARMAG))
       {
         (void) close (desc);
@@ -332 +331 @@
 #ifdef AIAMAG
   {
-    register int nread = read (desc, (char *) &fl_header, FL_HSZ);
+    register int nread = read (desc, &fl_header, FL_HSZ);
 
     if (nread != FL_HSZ)
@@ -342 +341 @@
     /* If this is a "big" archive, then set the flag and
        re-read the header into the "big" structure. */
-    if (!bcmp (fl_header.fl_magic, AIAMAGBIG, SAIAMAG))
+    if (!memcmp (fl_header.fl_magic, AIAMAGBIG, SAIAMAG))
       {
         big_archive = 1;
@@ -354 +353 @@
 
         /* re-read the header into the "big" structure */
-        nread = read (desc, (char *) &fl_header_big, FL_HSZ_BIG);
+        nread = read (desc, &fl_header_big, FL_HSZ_BIG);
         if (nread != FL_HSZ_BIG)
           {
@@ -364 +363 @@
 #endif
        /* Check to make sure this is a "normal" archive. */
-      if (bcmp (fl_header.fl_magic, AIAMAG, SAIAMAG))
+      if (memcmp (fl_header.fl_magic, AIAMAG, SAIAMAG))
         {
           (void) close (desc);
@@ -458 +457 @@
         if (big_archive)
           {
-            nread = read (desc, (char *) &member_header_big,
+            nread = read (desc, &member_header_big,
                           AR_MEMHDR_SZ(member_header_big) );
 
@@ -490 +489 @@
 #endif
           {
-            nread = read (desc, (char *) &member_header,
+            nread = read (desc, &member_header,
                           AR_MEMHDR_SZ(member_header) );
 
@@ -528 +527 @@
 
 #else   /* Not AIAMAG.  */
-        nread = read (desc, (char *) &member_header, AR_HDR_SIZE);
+        nread = read (desc, &member_header, AR_HDR_SIZE);
         if (nread == 0)
           /* No data left means end of file; that is OK.  */
@@ -537 +536 @@
             || (
 # ifdef ARFMAG
-                bcmp (member_header.ar_fmag, ARFMAG, 2)
+                memcmp (member_header.ar_fmag, ARFMAG, 2)
 # else
                 1
@@ -543 +542 @@
                 &&
 # ifdef ARFZMAG
-                bcmp (member_header.ar_fmag, ARFZMAG, 2)
+                memcmp (member_header.ar_fmag, ARFZMAG, 2)
 # else
                 1
@@ -556 +555 @@
 
         name = namebuf;
-        bcopy (member_header.ar_name, name, sizeof member_header.ar_name);
+        memcpy (name, member_header.ar_name, sizeof member_header.ar_name);
         {
           register char *p = name + sizeof member_header.ar_name;
@@ -596 +595 @@
               int namesize = atoi (name + 3);
 
-              name = (char *) alloca (namesize + 1);
+              name = alloca (namesize + 1);
               nread = read (desc, name, namesize);
               if (nread != namesize)
@@ -667 +666 @@
             char *limit;
 
-            namemap = (char *) alloca (eltsize);
+            namemap = alloca (eltsize);
             nread = read (desc, namemap, eltsize);
             if (nread != eltsize)
@@ -710 +709 @@
 
 int
-ar_name_equal (char *name, char *mem, int truncated)
+ar_name_equal (const char *name, const char *mem, int truncated)
 {
-  char *p;
+  const char *p;
 
   p = strrchr (name, '/');
@@ -742 +741 @@
 /* ARGSUSED */
 static long int
-ar_member_pos (int desc UNUSED, char *mem, int truncated,
+ar_member_pos (int desc UNUSED, const char *mem, int truncated,
                long int hdrpos, long int datapos UNUSED, long int size UNUSED,
                long int date UNUSED, int uid UNUSED, int gid UNUSED,
-               int mode UNUSED, char *name)
+               int mode UNUSED, const void *name)
 {
   if (!ar_name_equal (name, mem, truncated))
@@ -760 +759 @@
 
 int
-ar_member_touch (char *arname, char *memname)
+ar_member_touch (const char *arname, const char *memname)
 {
-  long int pos = ar_scan (arname, ar_member_pos, (long int) memname);
+  long int pos = ar_scan (arname, ar_member_pos, memname);
   int fd;
   struct ar_hdr ar_hdr;
@@ -780 +779 @@
   if (lseek (fd, pos, 0) < 0)
     goto lose;
-  if (AR_HDR_SIZE != read (fd, (char *) &ar_hdr, AR_HDR_SIZE))
+  if (AR_HDR_SIZE != read (fd, &ar_hdr, AR_HDR_SIZE))
     goto lose;
   /* Write back the header, thus touching the archive file.  */
   if (lseek (fd, pos, 0) < 0)
     goto lose;
-  if (AR_HDR_SIZE != write (fd, (char *) &ar_hdr, AR_HDR_SIZE))
+  if (AR_HDR_SIZE != write (fd, &ar_hdr, AR_HDR_SIZE))
     goto lose;
   /* The file's mtime is the time we we want.  */
@@ -805 +804 @@
   if (lseek (fd, pos, 0) < 0)
     goto lose;
-  if (AR_HDR_SIZE != write (fd, (char *) &ar_hdr, AR_HDR_SIZE))
+  if (AR_HDR_SIZE != write (fd, &ar_hdr, AR_HDR_SIZE))
     goto lose;
   close (fd);
@@ -822 +821 @@
 
 long int
-describe_member (int desc, char *name, int truncated,
+describe_member (int desc, const char *name, int truncated,
                  long int hdrpos, long int datapos, long int size,
-                 long int date, int uid, int gid, int mode)
+                 long int date, int uid, int gid, int mode, const void *arg)
 {
   extern char *ctime ();
@@ -840 +839 @@
 main (int argc, char **argv)
 {
-  ar_scan (argv[1], describe_member);
+  ar_scan (argv[1], describe_member, NULL);
   return 0;
 }