mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
9fa9eb9ac7
Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight
49 lines
1.9 KiB
C
49 lines
1.9 KiB
C
--- unzoo.c.orig 2016-07-26 12:44:10 UTC
|
|
+++ unzoo.c
|
|
@@ -2590,20 +2590,20 @@ int ExtrArch ( bim, out, ovr
|
|
/* but only if the user did not request otherwise */
|
|
|
|
/* building the universal path of this member */
|
|
+ int found_trav = 0;
|
|
char patu [sizeof(Entry.diru) + sizeof(Entry.namu) + 2];
|
|
strcpy( patu, Entry.diru );
|
|
if ( strlen(patu) && patu[strlen(patu)-1] != '/') strcat( patu, "/" );
|
|
strcat( patu, (Entry.lnamu ? Entry.namu : Entry.nams) );
|
|
|
|
- int found_trav = 0;
|
|
|
|
if ( strstr( patu, "/../" )) {
|
|
- found_trav = 1;
|
|
|
|
/* remove "/../" from the path */
|
|
char tmp [sizeof(patu)];
|
|
char *p;
|
|
char *q;
|
|
+ found_trav = 1;
|
|
memset(tmp, 0, sizeof(tmp));
|
|
q = patu;
|
|
|
|
@@ -2625,10 +2625,10 @@ int ExtrArch ( bim, out, ovr
|
|
printf("unzoo: skipped \"/../\" path component(s) in '%s'\n", Entry.patl);
|
|
}
|
|
if ( *patu == '/' && !strlen( pre ) ) {
|
|
- found_trav = 1;
|
|
|
|
char *p = malloc(sizeof(patu));
|
|
char *q = p;
|
|
+ found_trav = 1;
|
|
memset(p, 0, sizeof(patu));
|
|
strcpy(p, patu);
|
|
while ( q[0] == '/' ) q++;
|
|
@@ -2638,9 +2638,9 @@ int ExtrArch ( bim, out, ovr
|
|
printf("unzoo: skipped root directory path component in '%s'\n", patl);
|
|
}
|
|
if ( !strncmp( patu, "../", 3 )) {
|
|
- found_trav = 1;
|
|
|
|
char tmp [sizeof(patu)];
|
|
+ found_trav = 1;
|
|
memset(tmp, 0, sizeof(tmp));
|
|
strcpy(tmp, patu + 3);
|
|
strcpy(patu, tmp);
|