Ported to Solaris 8.

2 files changed, 35 insertions, 14 deletions

diff --git a/sysutils/same/distinfo b/sysutils/same/distinfo
index ed3fba87415..aa90da9c6b0 100644
--- a/sysutils/same/distinfo
+++ b/sysutils/same/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/08/04 22:46:27 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/08/04 22:59:02 rillig Exp $
 
 SHA1 (same-1.8.tar.gz) = 39d95e70c09703b5c7525a6ea896c097f744d288
 RMD160 (same-1.8.tar.gz) = 987e6dc1c99258f00ed831af3fa3f034ebe08134
 Size (same-1.8.tar.gz) = 9398 bytes
-SHA1 (patch-ac) = d8b2d46570c54f54b16b0562ae594ad3e23f8257
+SHA1 (patch-ac) = 872eb12f82f5875b5980a4bf43c5af18b473fbca
diff --git a/sysutils/same/patches/patch-ac b/sysutils/same/patches/patch-ac
index 7c204bedeae..7e03ac4f7ed 100644
--- a/sysutils/same/patches/patch-ac
+++ b/sysutils/same/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/04 22:59:02 rillig Exp $
 
 --- same.c.orig	2004-07-16 19:30:01.000000000 +0200
-+++ same.c	2006-08-05 00:17:54.000000000 +0200
++++ same.c	2006-08-05 00:57:39.680842400 +0200
 @@ -106,10 +106,9 @@
   * - There is a 1024 (BUFSIZE) character limit to pathnames when using 
   *   symlinks.
@@ -31,7 +31,19 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  #ifdef __linux__
  #include <asm/page.h>
  #else /* !__linux__ */
-@@ -184,7 +175,7 @@ static const char *o_cache;
+@@ -157,6 +148,11 @@ extern int lstat64 (__const char *__rest
+ #define true		1
+ #define false		0
+ 
++#if defined(__GNUC__)
++#  define attribute_unused __attribute__((__unused__))
++#else
++#  define attribute_unused /**/
++#endif
+ 
+ static volatile int stop;
+ static volatile int doing_input;
+@@ -184,7 +180,7 @@ static const char *o_cache;
  
  struct name_entry {
      struct name_entry *next;
@@ -40,7 +52,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  };
  
  #define F_CRC_VALID		(1 << 0)
-@@ -196,7 +187,7 @@ struct inode_entry {
+@@ -196,7 +192,7 @@ struct inode_entry {
      struct name_entry *names;
      int flags;			/* See F_* definitions above */
      /* The two fields below may have been read from the cache */
@@ -49,7 +61,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
      unsigned int crc;		/* valid if flags & F_CRC_VALID only */
      /* The four fields below are valid if flags & F_STAT_VALID only */
      dev_t device;
-@@ -288,7 +279,7 @@ static void read_list(void);
+@@ -288,7 +284,7 @@ static void read_list(void);
  static const char *get_fname(void);
  static struct inode_entry *get_entry(void);
  static int __get_stat(struct inode_entry *entry);
@@ -58,7 +70,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  static int __get_crc(struct inode_entry *entry);
  static int cmp(const struct inode_entry *entry1,
  	       const struct inode_entry *entry2);
-@@ -379,7 +370,7 @@ static void dump_inode_entry(const struc
+@@ -379,7 +375,7 @@ static void dump_inode_entry(const struc
  
      printf("%sentry %p size %lu crc %08x device %lx inode %lx nlink %d uid "
  	   "%lx\n",
@@ -67,7 +79,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  	   (unsigned long)entry->device, (unsigned long)entry->inode,
  	   entry->nlink, (unsigned long)entry->uid);
      for (names = entry->names; names; names = names->next)
-@@ -429,7 +420,7 @@ static void load_cache(void)
+@@ -429,7 +425,7 @@ static void load_cache(void)
      gzFile *in;
      unsigned long line = 0;
      char *s;
@@ -76,7 +88,16 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
      unsigned int crc;
      const char *name;
      unsigned int hash = 0;
-@@ -1168,7 +1159,7 @@ static struct inode_entry *get_entry(voi
+@@ -659,7 +655,7 @@ static struct name_entry *alloc_name_ent
+     return entry;
+ }
+ 
+-static void delete_name_entry(struct name_entry *entry __attribute__((__unused__)))
++static void delete_name_entry(struct name_entry *entry attribute_unused)
+ {
+     /*
+      *  We don't free names allocated from the pool
+@@ -1168,7 +1164,7 @@ static struct inode_entry *get_entry(voi
  {
      const char *buf;
      struct inode_entry *entry;
@@ -85,7 +106,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
      unsigned int hash;
  
      do {
-@@ -1176,7 +1167,7 @@ static struct inode_entry *get_entry(voi
+@@ -1176,7 +1172,7 @@ static struct inode_entry *get_entry(voi
  	if (buf == NULL)
  	    return NULL;
  	stat_stat++;
@@ -94,7 +115,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  	    fprintf(stderr, "stat %s: %s\n", buf, strerror(errno));
  	    exit(1);
  	}
-@@ -1204,13 +1195,13 @@ static struct inode_entry *get_entry(voi
+@@ -1204,13 +1200,13 @@ static struct inode_entry *get_entry(voi
  
  static int __get_stat(struct inode_entry *entry)
  {
@@ -110,7 +131,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  	    fprintf(stderr, "stat %s: %s\n", name->name, strerror(errno));
  	else if (S_ISREG(sb.st_mode)) {
  	    entry->device = sb.st_dev;
-@@ -1231,7 +1222,7 @@ static int __get_stat(struct inode_entry
+@@ -1231,7 +1227,7 @@ static int __get_stat(struct inode_entry
       *  Calculate the Hash Value for an Inode Entry
       */
  
@@ -119,7 +140,7 @@ $NetBSD: patch-ac,v 1.1 2006/08/04 22:46:27 rillig Exp $
  {
      return (sb->st_size) % MAXHASH;
  }
-@@ -1256,7 +1247,7 @@ static int __get_crc(struct inode_entry 
+@@ -1256,7 +1252,7 @@ static int __get_crc(struct inode_entry 
      }
  
      while ((n = read(f1, b1, BUFSIZE)) > 0)