freebsd-ports/archivers/zoo/files/patch-misc.c
Mathieu Arnold 9fa9eb9ac7 Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight
2016-07-26 16:51:15 +00:00

32 lines
924 B
C

--- misc.c.orig 1991-07-16 15:52:54 UTC
+++ misc.c
@@ -135,11 +135,16 @@ if available, else the short filename is
char *fullpath (direntry)
struct direntry *direntry;
{
- static char result[PATHSIZE];
+ static char result[PATHSIZE+PATHSIZE+12]; /* Room for enough space */
combine (result,
direntry->dirlen != 0 ? direntry->dirname : "",
(direntry->namlen != 0) ? direntry->lfname : direntry->fname
);
+
+ if (strlen (result) >= PATHSIZE) {
+ prterror ('f', "Combined dirname and filename too long\n");
+ }
+
return (result);
}
@@ -172,7 +177,11 @@ int preserve;
frd_zooh (header, zoo_file);
+#ifdef __LP64__
+ if ((int)(header->zoo_start + header->zoo_minus) != 0)
+#else
if ((header->zoo_start + header->zoo_minus) != 0L)
+#endif
prterror ('f', failed_consistency);
if (ver_too_high (header))
prterror ('f', wrong_version, header->major_ver, header->minor_ver);