From e1ac06bccae865dc1cd7266302961a0ff68716b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 7 Dec 1998 22:36:22 +0000 Subject: [PATCH] (read_header): Accept file names as specified by POSIX.1-1996 section 10.1.1. --- src/list.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/list.c b/src/list.c index 2eba9f6..7a9bd50 100644 --- a/src/list.c +++ b/src/list.c @@ -415,9 +415,28 @@ read_header (void) } else { - assign_string (¤t_file_name, - (next_long_name ? next_long_name - : current_header->header.name)); + char *name = next_long_name; + struct posix_header *h = ¤t_header->header; + char namebuf[sizeof h->prefix + 1 + sizeof h->name + 1]; + + if (! name) + { + /* Accept file names as specified by POSIX.1-1996 + section 10.1.1. */ + char *np = namebuf; + if (h->prefix[0]) + { + memcpy (np, h->prefix, sizeof h->prefix); + np[sizeof h->prefix] = '\0'; + np += strlen (np); + *np++ = '/'; + } + memcpy (np, h->name, sizeof h->name); + np[sizeof h->name] = '\0'; + name = namebuf; + } + + assign_string (¤t_file_name, name); assign_string (¤t_link_name, (next_long_link ? next_long_link : current_header->header.linkname)); -- 2.45.2