47d322ad49
standard headers, etc. "time_t" is not "long". Don't issue own declarations of standard functions. Should fix Solaris build.
76 lines
2.6 KiB
Text
76 lines
2.6 KiB
Text
$NetBSD: patch-ai,v 1.5 2014/06/29 03:24:33 dholland Exp $
|
|
|
|
- use standard headers
|
|
- use printf formats matching types
|
|
- add zoo_pointer and logic related to it, appears to be a bug fix
|
|
- changes calling gettz() that should be reverted now that gettz() has
|
|
been fixed up
|
|
|
|
--- zoolist.c.orig 1991-07-19 22:57:27.000000000 +0000
|
|
+++ zoolist.c
|
|
@@ -18,10 +18,11 @@ duplicate information will be dumped.
|
|
Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved
|
|
(C) Copyright 1988 Rahul Dhesi -- All rights reserved
|
|
*/
|
|
+#include <stdio.h>
|
|
#include "options.h"
|
|
#include "portable.h"
|
|
#include "zoomem.h" /* to get ZOOCOUNT */
|
|
-
|
|
+#include <time.h>
|
|
/* Lists files in archive */
|
|
#include "zoo.h"
|
|
#include "errors.i"
|
|
@@ -92,6 +93,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 +213,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++;
|
|
@@ -414,7 +419,7 @@ if (fiz_ofs != 0L) { /* i
|
|
if (direntry.fattr == 0)
|
|
printf ("--- ");
|
|
else if ((direntry.fattr >> 22) == 1)
|
|
- printf ("%03o ", direntry.fattr & 0x1ff);
|
|
+ printf ("%03o ", (unsigned int)direntry.fattr & 0x1ff);
|
|
else
|
|
printf ("??? ");
|
|
}
|
|
@@ -437,6 +442,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 +549,12 @@ int file_tz;
|
|
{
|
|
long gettz();
|
|
int diff_tz; /* timezone difference */
|
|
+ time_t 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 */
|