$NetBSD: patch-ai,v 1.3 2007/05/13 16:59:39 taca Exp $ --- zoolist.c.orig 1991-07-20 07:57:27.000000000 +0900 +++ zoolist.c @@ -92,6 +92,7 @@ int genson = 1; /* enable/disable ge int show_mode = 0; /* show file protection */ #endif int first_dir = 1; /* if first direntry -- to adjust dat_ofs */ +unsigned long zoo_pointer = 0; /* Track our position in the file */ while (*option) { switch (*option) { @@ -211,6 +212,9 @@ if (fiz_ofs != 0L) { /* i show_acmt (&zoo_header, zoo_file, 0); /* show archive comment */ } + /* Begin tracking our position in the file */ + zoo_pointer = zoo_header.zoo_start; + /* Seek to the beginning of the first directory entry */ if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) { ercount++; @@ -437,6 +441,11 @@ if (fiz_ofs != 0L) { /* i if (verb_list && !fast) show_comment (&direntry, zoo_file, 0, (char *) NULL); } /* end if (lots of conditions) */ + + /* Make sure we are not seeking to already processed data */ + if (direntry.next <= zoo_pointer) + prterror ('f', "ZOO chain structure is corrupted\n"); + zoo_pointer = direntry.next; /* ..seek to next dir entry */ zooseek (zoo_file, direntry.next, 0); @@ -539,10 +548,12 @@ int file_tz; { long gettz(); int diff_tz; /* timezone difference */ + long t; if (file_tz == NO_TZ) /* if no timezone stored ..*/ printf (" "); /* .. just pad with blanks */ else { - diff_tz = (file_tz / 4) - (int) (gettz() / 3600); + time(&t); + diff_tz = (file_tz / 4) - (int) (gettz(t) / 3600); if (diff_tz == 0) printf (" "); /* print nothing if same */ else if (diff_tz > 0) /* else print signed difference */