news/nn/patches/patch-ar

   1 $NetBSD$
   2
   3 --- kill.c.orig Mon Jun 17 23:58:08 2002
   4 +++ kill.c      Sun Jul  7 21:33:10 2002
   5 @@ -424,7 +424,7 @@
   6  typedef struct {
   7      long               ckh_magic;
   8      time_t             ckh_db_check;
   9 -    off_t              ckh_pattern_offset;
  10 +    long                ckh_pattern_offset;
  11      long               ckh_pattern_size;
  12      long               ckh_entries;
  13      long               ckh_regexp_size;
  14 @@ -579,7 +579,7 @@
  15      comp_kill_header header;
  16      comp_kill_entry  entry;
  17      time_t now, age;
  18 -    off_t cur_line_start;
  19 +    long cur_line_start;
  20      char line[512];
  21      register char *cp, *np;
  22      register int c;
  23 @@ -605,7 +605,7 @@
  24
  25      tprintf("\nCompiling kill file\n");
  26
  27 -    fseek(compf, (off_t)sizeof(header), 0);
  28 +    fseek(compf, (long)sizeof(header), 0);
  29
  30      now = cur_time();
  31
  32 @@ -850,7 +850,7 @@
  33
  34      if (header.ckh_pattern_size > 0) {
  35         kill_patterns = newstr(header.ckh_pattern_size);
  36 -       fseek(killf, (off_t)(header.ckh_entries * sizeof(entry)), 1);
  37 +       fseek(killf, (long)(header.ckh_entries * sizeof(entry)), 1);
  38         if (fread(kill_patterns, sizeof(char), (int)header.ckh_pattern_size, killf)
  39             !=  header.ckh_pattern_size) goto err;
  40      } else
  41 @@ -862,7 +862,7 @@
  42
  43      tb = group_regexp_table;
  44
  45 -    fseek(killf, (off_t)sizeof(header), 0);
  46 +    fseek(killf, (long)sizeof(header), 0);
  47      for (n = header.ckh_entries, kl = kill_tab; --n >= 0; kl++) {
  48         if (fread((char *)&entry, sizeof(entry), 1, killf) != 1) goto err;
  49         if (header.ckh_pattern_size <= entry.ck_pattern_index ||