int len;
{
int sum = 0;
+ unsigned char *pc = (unsigned char*)p;
- while (len--) sum += *(unsigned char*)p++;
+ while (len--) sum += *pc++;
return sum & 0xff;
}
}
static void
-put_longword(v)
- long v;
+put_longword(long v)
{
put_byte(v);
put_byte(v >> 8);
put_byte(v >> 24);
}
+#ifdef HAVE_UINT64_T
+static uint64_t
+get_longlongword()
+{
+ uint64_t b0, b1, b2, b3, b4, b5, b6, b7;
+ uint64_t l;
+
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1)
+ printf("%02d %2d: ", get_ptr - start_ptr, 4);
+#endif
+ b0 = GET_BYTE();
+ b1 = GET_BYTE();
+ b2 = GET_BYTE();
+ b3 = GET_BYTE();
+ b4 = GET_BYTE();
+ b5 = GET_BYTE();
+ b6 = GET_BYTE();
+ b7 = GET_BYTE();
+
+ l = (b7 << 24) + (b6 << 16) + (b5 << 8) + b4;
+ l <<= 32;
+ l |= (b3 << 24) + (b2 << 16) + (b1 << 8) + b0;
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1)
+ printf("%lld(%#016llx)\n", l, l);
+#endif
+ return l;
+}
+
+static void
+put_longlongword(uint64_t v)
+{
+ put_byte(v);
+ put_byte(v >> 8);
+ put_byte(v >> 16);
+ put_byte(v >> 24);
+ put_byte(v >> 32);
+ put_byte(v >> 40);
+ put_byte(v >> 48);
+ put_byte(v >> 56);
+}
+#endif
+
static int
get_bytes(buf, len, size)
char *buf;
to_code_save = CODE_CAP;
to_code = CODE_SJIS;
}
+#endif
+
+ /* special case: if `name' has small lettter, not convert case. */
+ if (from_code == CODE_SJIS && case_to == TO_LOWER) {
+ for (i = 0; i < len; i++) {
+#ifdef MULTIBYTE_FILENAME
+ if (SJIS_FIRST_P(name[i]) && SJIS_SECOND_P(name[i+1]))
+ i++;
+ else
+#endif
+ if (islower(name[i])) {
+ case_to = NONE;
+ break;
+ }
+ }
+ }
+#ifdef MULTIBYTE_FILENAME
if (from_code == CODE_SJIS && to_code == CODE_UTF8) {
- for (i = 0; i < len; i++)
- /* FIXME: provisionally fix for the Mac OS CoreFoundation */
- if ((unsigned char)name[i] == LHA_PATHSEP) name[i] = '/';
+ for (i = 0; i < len; i++) {
+ if (SJIS_FIRST_P(name[i]) && SJIS_SECOND_P(name[i+1]))
+ i++;
+ else {
+ /* FIXME: provisionally fix for the Mac OS CoreFoundation */
+ if (strchr(from_delim, name[i]))
+ name[i] = '/';
+ }
+ }
sjis_to_utf8(tmp, name, sizeof(tmp));
strncpy(name, tmp, size);
name[size-1] = 0;
}
#endif
- /* special case: if `name' has small lettter, not convert case. */
- if (from_code == CODE_SJIS && case_to == TO_LOWER) {
- for (i = 0; i < len; i++) {
-#ifdef MULTIBYTE_FILENAME
- if (SJIS_FIRST_P(name[i]) && SJIS_SECOND_P(name[i+1]))
- i++;
- else
-#endif
- if (islower(name[i])) {
- case_to = NONE;
- break;
- }
- }
- }
-
for (i = 0; i < len; i ++) {
#ifdef MULTIBYTE_FILENAME
if (from_code == CODE_EUC &&
name_length = strlen(hdr->name);
while (header_size) {
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1)
+ printf("---\n");
+#endif
setup_get(data);
if (sizeof(data) < header_size) {
error("header size (%ld) too large.", header_size);
ext_type = get_byte();
switch (ext_type) {
case 0:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < header crc >\n");
+#endif
/* header crc (CRC-16) */
hdr->header_crc = get_word();
/* clear buffer for CRC calculation. */
skip_bytes(header_size - n - 2);
break;
case 1:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < filename >\n");
+#endif
/* filename */
name_length =
get_bytes(hdr->name, header_size-n, sizeof(hdr->name)-1);
hdr->name[name_length] = 0;
break;
case 2:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < directory >\n");
+#endif
/* directory */
dir_length = get_bytes(dirname, header_size-n, sizeof(dirname)-1);
dirname[dir_length] = 0;
break;
case 0x40:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < MS-DOS attribute >\n");
+#endif
/* MS-DOS attribute */
hdr->attribute = get_word();
break;
case 0x41:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < Windows time stamp (FILETIME) >\n");
+#endif
/* Windows time stamp (FILETIME structure) */
/* it is time in 100 nano seconds since 1601-01-01 00:00:00 */
skip_bytes(8); /* last access time is ignored */
break;
+ case 0x42:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < 64bits file size header >\n");
+#endif
+#ifdef HAVE_UINT64_T
+ /* 64bits file size header (UNLHA32 extension) */
+ hdr->packed_size = get_longlongword();
+ hdr->original_size = get_longlongword();
+#else
+ skip_bytes(8);
+ skip_bytes(8);
+#endif
+
+ break;
case 0x50:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < UNIX permission >\n");
+#endif
/* UNIX permission */
hdr->unix_mode = get_word();
break;
case 0x51:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < UNIX gid and uid >\n");
+#endif
/* UNIX gid and uid */
hdr->unix_gid = get_word();
hdr->unix_uid = get_word();
break;
case 0x52:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < UNIX group name >\n");
+#endif
/* UNIX group name */
i = get_bytes(hdr->group, header_size-n, sizeof(hdr->group)-1);
hdr->group[i] = '\0';
break;
case 0x53:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < UNIX user name >\n");
+#endif
/* UNIX user name */
i = get_bytes(hdr->user, header_size-n, sizeof(hdr->user)-1);
hdr->user[i] = '\0';
break;
case 0x54:
+#if DUMP_HEADER
+ if (verbose_listing && verbose > 1) printf(" < UNIX last modifed time (time_t) >\n");
+#endif
/* UNIX last modified time */
hdr->unix_last_modified_stamp = (time_t) get_longword();
break;
}
get_bytes(hdr->method, 5, sizeof(hdr->method));
- hdr->packed_size = get_longword();
- hdr->original_size = get_longword();
+ hdr->packed_size = (unsigned long)get_longword();
+ hdr->original_size = (unsigned long)get_longword();
hdr->unix_last_modified_stamp = generic_to_unix_stamp(get_longword());
hdr->attribute = get_byte(); /* MS-DOS attribute */
hdr->header_level = get_byte();
}
get_bytes(hdr->method, 5, sizeof(hdr->method));
- hdr->packed_size = get_longword(); /* skip size */
- hdr->original_size = get_longword();
+ hdr->packed_size = (unsigned long)get_longword(); /* skip size */
+ hdr->original_size = (unsigned long)get_longword();
hdr->unix_last_modified_stamp = generic_to_unix_stamp(get_longword());
hdr->attribute = get_byte(); /* 0x20 fixed */
hdr->header_level = get_byte();
}
get_bytes(hdr->method, 5, sizeof(hdr->method));
- hdr->packed_size = get_longword();
- hdr->original_size = get_longword();
+ hdr->packed_size = (unsigned long)get_longword();
+ hdr->original_size = (unsigned long)get_longword();
hdr->unix_last_modified_stamp = get_longword();
hdr->attribute = get_byte(); /* reserved */
hdr->header_level = get_byte();
}
get_bytes(hdr->method, 5, sizeof(hdr->method));
- hdr->packed_size = get_longword();
- hdr->original_size = get_longword();
+ hdr->packed_size = (unsigned long)get_longword();
+ hdr->original_size = (unsigned long)get_longword();
hdr->unix_last_modified_stamp = get_longword();
hdr->attribute = get_byte(); /* reserved */
hdr->header_level = get_byte();
/* filename conversion */
switch (hdr->extend_type) {
case EXTEND_MSDOS:
- filename_case = noconvertcase ? NONE : TO_LOWER;
+ filename_case = convertcase ? TO_LOWER : NONE;
break;
case EXTEND_HUMAN:
case EXTEND_OS68K:
break;
default:
- filename_case = noconvertcase ? NONE : TO_LOWER;
+ filename_case = convertcase ? TO_LOWER : NONE;
break;
}
n = fread(buffer, 1, sizeof(buffer), fp);
for (p = buffer; p < buffer + n; p++) {
- if (! (p[I_METHOD]=='-' && p[I_METHOD+1]=='l' && p[I_METHOD+4]=='-'))
+ if (! (p[I_METHOD]=='-' &&
+ (p[I_METHOD+1]=='l' || p[I_METHOD+1]=='p') &&
+ p[I_METHOD+4]=='-'))
continue;
- /* found "-l??-" keyword (as METHOD type string) */
+ /* found "-[lp]??-" keyword (as METHOD type string) */
/* level 0 or 1 header */
if ((p[I_HEADER_LEVEL] == 0 || p[I_HEADER_LEVEL] == 1)
return first;
}
+static int
+copy_path_element(char *dst, const char *src, int size)
+{
+ int i;
+
+ if (size < 1) return 0;
+
+ for (i = 0; i < size; i++) {
+ dst[i] = src[i];
+ if (dst[i] == '\0')
+ return i;
+ if (dst[i] == '/') {
+ dst[++i] = 0;
+ return i;
+ }
+ }
+
+ dst[--i] = 0;
+
+ return i;
+}
+
+/*
+ canonicalize path
+
+ remove leading "xxx/../"
+ remove "./", "././", "././ ... ./"
+ remove duplicated "/"
+*/
+static int
+canon_path(char *newpath, char *path, size_t size)
+{
+ char *p = newpath;
+
+ path = remove_leading_dots(path);
+
+ while (*path) {
+ if (path[0] == '.' && path[1] == '/')
+ path += 2;
+ else {
+ int len;
+ len = copy_path_element(newpath, path, size);
+
+ path += len;
+ newpath += len;
+ size -= len;
+ if (size <= 1)
+ break;
+ }
+
+ /* remove duplicated '/' */
+ while (*path == '/') path++;
+ }
+
+ /* When newpath is empty, set "." */
+ if (newpath == p) {
+ strcpy(newpath, ".");
+ newpath++;
+ }
+
+ return newpath - p; /* string length */
+}
+
void
init_header(name, v_stat, hdr)
char *name;
hdr->original_size = v_stat->st_size;
hdr->attribute = GENERIC_ATTRIBUTE;
hdr->header_level = header_level;
- len = str_safe_copy(hdr->name,
- remove_leading_dots(name),
- sizeof(hdr->name));
+
+ len = canon_path(hdr->name, name, sizeof(hdr->name));
+
hdr->crc = 0x0000;
hdr->extend_type = EXTEND_UNIX;
hdr->unix_last_modified_stamp = v_stat->st_mtime;
if (optional_system_kanji_code)
system_kanji_code = optional_system_kanji_code;
- if (generic_format)
+ if (generic_format && convertcase)
filename_case = TO_UPPER;
if (hdr->header_level == 0) {