X-Git-Url: http://git.osdn.net/view?p=lha%2Flha.git;a=blobdiff_plain;f=src%2Flhext.c;h=ba73f969e13f9faf585aaddd41bb2f82d7427f0d;hp=c347f48eb338ec492370d49f912b1fa119baaae3;hb=62e045aaf28eb72fe746540bc50a3f19369e7c3e;hpb=593c8bcd50329255e282c6875a34a52c799e44f4

diff --git a/src/lhext.c b/src/lhext.c
index c347f48..ba73f96 100644
--- a/src/lhext.c
+++ b/src/lhext.c
@@ -1,425 +1,760 @@
 /* ------------------------------------------------------------------------ */
-/* LHa for UNIX    															*/
-/*				lhext.c -- LHarc extract									*/
-/*																			*/
-/*		Copyright (C) MCMLXXXIX Yooichi.Tagawa								*/
-/*		Modified          		Nobutaka Watazaki							*/
-/*																			*/
-/*  Ver. 0.00  Original								1988.05.23  Y.Tagawa	*/
-/*  Ver. 1.00  Fixed								1989.09.22  Y.Tagawa	*/
-/*  Ver. 0.03  LHa for UNIX							1991.12.17  M.Oki		*/
-/*  Ver. 1.12  LHa for UNIX							1993.10.01	N.Watazaki	*/
-/*  Ver. 1.13b Symbolic Link Update Bug Fix			1994.06.21	N.Watazaki	*/
-/*	Ver. 1.14  Source All chagned					1995.01.14	N.Watazaki	*/
+/* LHa for UNIX                                                             */
+/*              lhext.c -- LHarc extract                                    */
+/*                                                                          */
+/*      Copyright (C) MCMLXXXIX Yooichi.Tagawa                              */
+/*      Modified                Nobutaka Watazaki                           */
+/*                                                                          */
+/*  Ver. 0.00  Original                             1988.05.23  Y.Tagawa    */
+/*  Ver. 1.00  Fixed                                1989.09.22  Y.Tagawa    */
+/*  Ver. 0.03  LHa for UNIX                         1991.12.17  M.Oki       */
+/*  Ver. 1.12  LHa for UNIX                         1993.10.01  N.Watazaki  */
+/*  Ver. 1.13b Symbolic Link Update Bug Fix         1994.06.21  N.Watazaki  */
+/*  Ver. 1.14  Source All chagned                   1995.01.14  N.Watazaki  */
 /*  Ver. 1.14e bugfix                               1999.04.30  T.Okamoto   */
 /* ------------------------------------------------------------------------ */
 #include "lha.h"
 /* ------------------------------------------------------------------------ */
-static int      skip_flg = FALSE;	/* FALSE..No Skip , TRUE..Skip */
-static char	   *methods[] =
+static int      skip_flg = FALSE;   /* FALSE..No Skip , TRUE..Skip */
+static char    *methods[] =
 {
-	LZHUFF0_METHOD, LZHUFF1_METHOD, LZHUFF2_METHOD, LZHUFF3_METHOD,
-	LZHUFF4_METHOD, LZHUFF5_METHOD, LZHUFF6_METHOD, LZHUFF7_METHOD,
-	LARC_METHOD, LARC5_METHOD, LARC4_METHOD,
-	LZHDIRS_METHOD,
-	NULL
+    LZHUFF0_METHOD, LZHUFF1_METHOD, LZHUFF2_METHOD, LZHUFF3_METHOD,
+    LZHUFF4_METHOD, LZHUFF5_METHOD, LZHUFF6_METHOD, LZHUFF7_METHOD,
+    LARC_METHOD, LARC5_METHOD, LARC4_METHOD,
+    LZHDIRS_METHOD,
+    PMARC0_METHOD, PMARC2_METHOD,
+    NULL
 };
 
+static void add_dirinfo(char* name, LzHeader* hdr);
+static void adjust_dirinfo();
+
+#ifdef HAVE_LIBAPPLEFILE
+static boolean decode_macbinary(FILE *ofp, off_t size, const char *outPath);
+#endif
+
 /* ------------------------------------------------------------------------ */
 static          boolean
 inquire_extract(name)
-	char           *name;
+    char           *name;
 {
-	struct stat     stbuf;
-
-	skip_flg = FALSE;
-	if (stat(name, &stbuf) >= 0) {
-		if (!is_regularfile(&stbuf)) {
-			error("Already exist (not a file)", name);
-			return FALSE;
-		}
-
-		if (noexec) {
-			printf("EXTRACT %s but file is exist.\n", name);
-			return FALSE;
-		}
-		else if (!force) {
-			if (!isatty(0))
-				return FALSE;
-
-			switch (inquire("OverWrite ?(Yes/[No]/All/Skip)", name, "YyNnAaSs\n")) {
-			case 0:
-			case 1:/* Y/y */
-				break;
-			case 2:
-			case 3:/* N/n */
-			case 8:/* Return */
-				return FALSE;
-			case 4:
-			case 5:/* A/a */
-				force = TRUE;
-				break;
-			case 6:
-			case 7:/* S/s */
-				skip_flg = TRUE;
-				break;
-			}
-		}
-	}
-	if (noexec)
-		printf("EXTRACT %s\n", name);
-
-	return TRUE;
+    struct stat     stbuf;
+
+    skip_flg = FALSE;
+    if (stat(name, &stbuf) >= 0) {
+        if (!is_regularfile(&stbuf)) {
+            error("\"%s\" already exists (not a file)", name);
+            return FALSE;
+        }
+
+        if (noexec) {
+            printf("EXTRACT %s but file is exist.\n", name);
+            return FALSE;
+        }
+        else if (!force) {
+            if (!isatty(0)) {
+                warning("skip to extract %s.", name);
+                return FALSE;
+            }
+
+            switch (inquire("OverWrite ?(Yes/[No]/All/Skip)", name, "YyNnAaSs\n")) {
+            case 0:
+            case 1:/* Y/y */
+                break;
+            case 2:
+            case 3:/* N/n */
+            case 8:/* Return */
+                return FALSE;
+            case 4:
+            case 5:/* A/a */
+                force = TRUE;
+                break;
+            case 6:
+            case 7:/* S/s */
+                skip_flg = TRUE;
+                break;
+            }
+        }
+    }
+
+    if (noexec)
+        printf("EXTRACT %s\n", name);
+
+    return TRUE;
+}
+
+static boolean
+make_name_with_pathcheck(char *name, size_t namesz, const char *q)
+{
+    int offset = 0;
+    const char *p;
+    int sz;
+    struct stat stbuf;
+
+    if (extract_directory) {
+        sz = xsnprintf(name, namesz, "%s/", extract_directory);
+        if (sz == -1) {
+            return FALSE;
+        }
+        offset += sz;
+    }
+
+#ifdef S_IFLNK
+    while ((p = strchr(q, '/')) != NULL) {
+        if (namesz - offset < (p - q) + 2) {
+            return FALSE;
+        }
+        memcpy(name + offset, q, (p - q));
+        name[offset + (p - q)] = 0;
+
+        offset += (p - q);
+        q = p + 1;
+
+        if (lstat(name, &stbuf) < 0) {
+            name[offset++] = '/';
+            break;
+        }
+        if (is_symlink(&stbuf)) {
+            return FALSE;
+        }
+        name[offset++] = '/';
+    }
+#endif
+
+    str_safe_copy(name + offset, q, namesz - offset);
+
+    return TRUE;
 }
 
 /* ------------------------------------------------------------------------ */
 static          boolean
 make_parent_path(name)
-	char           *name;
+    char           *name;
 {
-	char            path[FILENAME_LENGTH];
-	struct stat     stbuf;
-	register char  *p;
-
-	/* make parent directory name into PATH for recursive call */
-	strcpy(path, name);
-	for (p = path + strlen(path); p > path; p--)
-		if (p[-1] == '/') {
-			*--p = '\0';
-			break;
-		}
-
-	if (p == path) {
-		message("Why?", "ROOT");
-		return FALSE;	/* no more parent. */
-	}
-
-	if (GETSTAT(path, &stbuf) >= 0) {
-		if (is_directory(&stbuf))
-			return TRUE;
-		error("Not a directory", path);
-		return FALSE;
-	}
-	errno = 0;
-
-	if (verbose)
-		printf("Making directory \"%s\".\n", path);
-
-	if (mkdir(path, 0777) >= 0)	/* try */
-		return TRUE;	/* successful done. */
-	errno = 0;
-
-	if (!make_parent_path(path))
-		return FALSE;
-
-	if (mkdir(path, 0777) < 0) {	/* try again */
-		message("Cannot make directory", path);
-		return FALSE;
-	}
-
-	return TRUE;
+    char            path[FILENAME_LENGTH];
+    struct stat     stbuf;
+    register char  *p;
+
+    /* make parent directory name into PATH for recursive call */
+    str_safe_copy(path, name, sizeof(path));
+    for (p = path + strlen(path); p > path; p--)
+        if (p[-1] == '/') {
+            *--p = '\0';
+            break;
+        }
+
+    if (p == path) {
+        message("invalid path name \"%s\"", name);
+        return FALSE;   /* no more parent. */
+    }
+
+    if (GETSTAT(path, &stbuf) >= 0) {
+        if (is_directory(&stbuf))
+            return TRUE;
+    }
+
+    if (verbose)
+        message("Making directory \"%s\".", path);
+
+#if defined __MINGW32__
+    if (mkdir(path) >= 0)
+        return TRUE;
+#else
+    if (mkdir(path, 0777) >= 0) /* try */
+        return TRUE;    /* successful done. */
+#endif
+
+    if (!make_parent_path(path))
+        return FALSE;
+
+#if defined __MINGW32__
+    if (mkdir(path) < 0) {      /* try again */
+        error("Cannot make directory \"%s\"", path);
+        return FALSE;
+    }
+#else
+    if (mkdir(path, 0777) < 0) {    /* try again */
+        error("Cannot make directory \"%s\"", path);
+        return FALSE;
+    }
+#endif
+
+    return TRUE;
 }
 
 /* ------------------------------------------------------------------------ */
 static FILE    *
 open_with_make_path(name)
-	char           *name;
+    char           *name;
 {
-	FILE           *fp;
-
-	if ((fp = fopen(name, WRITE_BINARY)) == NULL) {
-		errno = 0;
-		if (!make_parent_path(name) ||
-		    (fp = fopen(name, WRITE_BINARY)) == NULL)
-			error("Cannot extract", name);
-		errno = 0;
-	}
-	return fp;
+    FILE           *fp;
+
+    if ((fp = fopen(name, WRITE_BINARY)) == NULL) {
+        if (!make_parent_path(name) ||
+            (fp = fopen(name, WRITE_BINARY)) == NULL)
+            error("Cannot extract a file \"%s\"", name);
+    }
+    return fp;
 }
 
 /* ------------------------------------------------------------------------ */
 static void
 adjust_info(name, hdr)
-	char           *name;
-	LzHeader       *hdr;
+    char           *name;
+    LzHeader       *hdr;
 {
-	time_t          utimebuf[2];
-
-	/* adjust file stamp */
-	utimebuf[0] = utimebuf[1] = hdr->unix_last_modified_stamp;
-
-	if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
-		utime(name, utimebuf);
-
-	if (hdr->extend_type == EXTEND_UNIX
-	    || hdr->extend_type == EXTEND_OS68K
-	    || hdr->extend_type == EXTEND_XOSK) {
-#ifdef NOT_COMPATIBLE_MODE
-		Please need your modification in this space.
-#else
-		if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
-			chmod(name, hdr->unix_mode);
+    struct utimbuf utimebuf;
+
+    /* adjust file stamp */
+    utimebuf.actime = utimebuf.modtime = hdr->unix_last_modified_stamp;
+
+    if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
+        utime(name, &utimebuf);
+
+    if (hdr->extend_type == EXTEND_UNIX
+        || hdr->extend_type == EXTEND_OS68K
+        || hdr->extend_type == EXTEND_XOSK) {
+
+        if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK) {
+            chmod(name, hdr->unix_mode);
+        }
+
+        if (!getuid()){
+            uid_t uid = hdr->unix_uid;
+            gid_t gid = hdr->unix_gid;
+
+#if HAVE_GETPWNAM && HAVE_GETGRNAM
+            if (hdr->user[0]) {
+                struct passwd *ent = getpwnam(hdr->user);
+                if (ent) uid = ent->pw_uid;
+            }
+            if (hdr->group[0]) {
+                struct group *ent = getgrnam(hdr->group);
+                if (ent) gid = ent->gr_gid;
+            }
 #endif
-		if (!getuid()){
+
 #if HAVE_LCHOWN
-			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK)
-				lchown(name, hdr->unix_uid, hdr->unix_gid);
-			else
+            if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK)
+                lchown(name, uid, gid);
+            else
 #endif /* HAVE_LCHWON */
-				chown(name, hdr->unix_uid, hdr->unix_gid);
-		}
-		errno = 0;
-	}
+                chown(name, uid, gid);
+        }
+    }
+#if __CYGWIN__
+    else {
+        /* On Cygwin, execute permission should be set for .exe or .dll. */
+        mode_t m;
+
+        umask(m = umask(0));    /* get current umask */
+        chmod(name, 0777 & ~m);
+    }
+#endif
 }
 
 /* ------------------------------------------------------------------------ */
-static void
+static off_t
 extract_one(afp, hdr)
-	FILE           *afp;	/* archive file */
-	LzHeader       *hdr;
+    FILE           *afp;    /* archive file */
+    LzHeader       *hdr;
 {
-	FILE           *fp;	/* output file */
-	struct stat     stbuf;
-	char            name[257];
-	int             crc;
-	int             method;
-	boolean         save_quiet, save_verbose, up_flag;
-	char           *q = hdr->name, c;
-
-	if (ignore_directory && strrchr(hdr->name, '/')) {
-		q = (char *) strrchr(hdr->name, '/') + 1;
-	}
-	else {
-		if (*q == '/') {
-			q++;
-			/*
-			 * if OSK then strip device name
-			 */
-			if (hdr->extend_type == EXTEND_OS68K
-			    || hdr->extend_type == EXTEND_XOSK) {
-				do
-					c = (*q++);
-				while (c && c != '/');
-				if (!c || !*q)
-					q = ".";	/* if device name only */
-			}
-		}
-	}
-
-	if (extract_directory)
-		sprintf(name, "%s/%s", extract_directory, q);
-	else
-		strcpy(name, q);
-
-
-	/* LZHDIRS_METHOD¤ò»ý¤Ä¥Ø¥Ã¥À¤ò¥Á¥§¥Ã¥¯¤¹¤ë */
-	/* 1999.4.30 t.okamoto */
-	for (method = 0;; method++) {
-		if (methods[method] == NULL) {
-			error("Unknown method skiped ...", name);
-			return;
-		}
-		if (bcmp(hdr->method, methods[method], 5) == 0)
-			break;
-	}
-
-	if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_REGULAR
-		&& method != LZHDIRS_METHOD_NUM) {
+    FILE           *fp; /* output file */
+#if HAVE_LIBAPPLEFILE
+    FILE           *tfp; /* temporary output file */
+#endif
+    struct stat     stbuf;
+    char            name[FILENAME_LENGTH];
+    unsigned int crc;
+    int             method;
+    boolean         save_quiet, save_verbose, up_flag;
+    char           *q = hdr->name, c;
+    off_t read_size = 0;
+
+    if (ignore_directory && strrchr(hdr->name, '/')) {
+        q = (char *) strrchr(hdr->name, '/') + 1;
+    }
+    else {
+        if (is_directory_traversal(q)) {
+            error("Possible directory traversal hack attempt in %s", q);
+            exit(1);
+        }
+
+        if (*q == '/') {
+            while (*q == '/') { q++; }
+
+            /*
+             * if OSK then strip device name
+             */
+            if (hdr->extend_type == EXTEND_OS68K
+                || hdr->extend_type == EXTEND_XOSK) {
+                do
+                    c = (*q++);
+                while (c && c != '/');
+                if (!c || !*q)
+                    q = ".";    /* if device name only */
+            }
+        }
+    }
+
+    if (!make_name_with_pathcheck(name, sizeof(name), q)) {
+        error("Possible symlink traversal hack attempt in %s", q);
+        exit(1);
+    }
+
+    /* LZHDIRS_METHODを持つヘッダをチェックする */
+    /* 1999.4.30 t.okamoto */
+    for (method = 0;; method++) {
+        if (methods[method] == NULL) {
+            error("Unknown method \"%.*s\"; \"%s\" will be skipped ...",
+                  5, hdr->method, name);
+            return read_size;
+        }
+        if (memcmp(hdr->method, methods[method], 5) == 0)
+            break;
+    }
+
+    if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_REGULAR
+        && method != LZHDIRS_METHOD_NUM) {
+    extract_regular:
 #if 0
-		for (method = 0;; method++) {
-			if (methods[method] == NULL) {
-				error("Unknown method skiped ...", name);
-				return;
-			}
-			if (bcmp(hdr->method, methods[method], 5) == 0)
-				break;
-		}
+        for (method = 0;; method++) {
+            if (methods[method] == NULL) {
+                error("Unknown method \"%.*s\"; \"%s\" will be skipped ...",
+                      5, hdr->method, name);
+                return read_size;
+            }
+            if (memcmp(hdr->method, methods[method], 5) == 0)
+                break;
+        }
+#endif
+
+        reading_filename = archive_name;
+        writing_filename = name;
+        if (output_to_stdout || verify_mode) {
+            /* "Icon\r" should be a resource fork file encoded in MacBinary
+               format, so that it should be skipped. */
+            if (hdr->extend_type == EXTEND_MACOS
+                && strcmp(basename(name), "Icon\r") == 0
+                && decode_macbinary_contents) {
+                return read_size;
+            }
+
+            if (noexec) {
+                printf("%s %s\n", verify_mode ? "VERIFY" : "EXTRACT", name);
+                return read_size;
+            }
+
+            save_quiet = quiet;
+            save_verbose = verbose;
+            if (!quiet && output_to_stdout) {
+                printf("::::::::\n%s\n::::::::\n", name);
+                quiet = TRUE;
+                verbose = FALSE;
+            }
+            else if (verify_mode) {
+                quiet = FALSE;
+                verbose = TRUE;
+            }
+
+#if defined(__MINGW32__) || defined(__DJGPP__)
+            {
+                int old_mode;
+                fflush(stdout);
+                old_mode = setmode(fileno(stdout), O_BINARY);
+#endif
+
+#if HAVE_LIBAPPLEFILE
+            /* On default, MacLHA encodes into MacBinary. */
+            if (hdr->extend_type == EXTEND_MACOS && !verify_mode && decode_macbinary_contents) {
+                /* build temporary file */
+                tfp = NULL; /* avoid compiler warnings `uninitialized' */
+                tfp = build_temporary_file();
+
+                crc = decode_lzhuf(afp, tfp,
+                                   hdr->original_size, hdr->packed_size,
+                                   name, method, &read_size);
+                fclose(tfp);
+                decode_macbinary(stdout, hdr->original_size, name);
+                unlink(temporary_name);
+            } else {
+                crc = decode_lzhuf(afp, stdout,
+                                   hdr->original_size, hdr->packed_size,
+                                   name, method, &read_size);
+            }
+#else
+            crc = decode_lzhuf(afp, stdout,
+                               hdr->original_size, hdr->packed_size,
+                               name, method, &read_size);
+#endif /* HAVE_LIBAPPLEFILE */
+#if defined(__MINGW32__) || defined(__DJGPP__)
+                fflush(stdout);
+                setmode(fileno(stdout), old_mode);
+            }
+#endif
+            quiet = save_quiet;
+            verbose = save_verbose;
+        }
+        else {
+#ifndef __APPLE__
+            /* "Icon\r" should be a resource fork of parent folder's icon,
+               so that it can be skipped when system is not Mac OS X. */
+            if (hdr->extend_type == EXTEND_MACOS
+                && strcmp(basename(name), "Icon\r") == 0
+                && decode_macbinary_contents) {
+                make_parent_path(name); /* create directory only */
+                return read_size;
+            }
+#endif /* __APPLE__ */
+            if (skip_flg == FALSE)  {
+                up_flag = inquire_extract(name);
+                if (up_flag == FALSE && force == FALSE) {
+                    return read_size;
+                }
+            }
+
+            if (skip_flg == TRUE) { /* if skip_flg */
+                if (stat(name, &stbuf) == 0 && force != TRUE) {
+                    if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
+                        if (quiet != TRUE)
+                            printf("%s : Skipped...\n", name);
+                        return read_size;
+                    }
+                }
+            }
+            if (noexec) {
+                return read_size;
+            }
+
+            signal(SIGINT, interrupt);
+#ifdef SIGHUP
+            signal(SIGHUP, interrupt);
 #endif
 
-		reading_filename = archive_name;
-		writting_filename = name;
-		if (output_to_stdout || verify_mode) {
-			if (noexec) {
-				printf("%s %s\n", verify_mode ? "VERIFY" : "EXTRACT", name);
-				if (afp == stdin) {
-					int             i = hdr->packed_size;
-					while (i--)
-						fgetc(afp);
-				}
-				return;
-			}
-
-			save_quiet = quiet;
-			save_verbose = verbose;
-			if (!quiet && output_to_stdout) {
-				printf("::::::::\n%s\n::::::::\n", name);
-				quiet = TRUE;
-				verbose = FALSE;
-			}
-			else if (verify_mode) {
-				quiet = FALSE;
-				verbose = TRUE;
-			}
-
-			crc = decode_lzhuf
-				(afp, stdout, hdr->original_size, hdr->packed_size, name, method);
-			quiet = save_quiet;
-			verbose = save_verbose;
-		}
-		else {
-			if (skip_flg == FALSE)  {
-				up_flag = inquire_extract(name);
-				if (up_flag == FALSE && force == FALSE) {
-					return;
-				}
-			}
-
-			if (skip_flg == TRUE) {	/* if skip_flg */
-				if (stat(name, &stbuf) == 0 && force != TRUE) {
-					if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
-						if (quiet != TRUE)
-							printf("%s : Skipped...\n", name);
-						return;
-					}
-				}
-			}
-			if (noexec) {
-				if (afp == stdin) {
-					int i = hdr->packed_size;
-					while (i--)
-						fgetc(afp);
-				}
-				return;
-			}
-
-			signal(SIGINT, interrupt);
-			signal(SIGHUP, interrupt);
-
-			unlink(name);
-			errno = 0;
-			remove_extracting_file_when_interrupt = TRUE;
-
-			if ((fp = open_with_make_path(name)) != NULL) {
-				crc = decode_lzhuf
-					(afp, fp, hdr->original_size, hdr->packed_size, name, method);
-				fclose(fp);
-			}
-			remove_extracting_file_when_interrupt = FALSE;
-			signal(SIGINT, SIG_DFL);
-			signal(SIGHUP, SIG_DFL);
-
-			if (!fp)
-				return;
-		}
-
-		errno = 0;
-		if (hdr->has_crc && crc != hdr->crc)
-			error("CRC error", name);
-	}
-	else if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_DIRECTORY
-			 || (hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK
-			 || method == LZHDIRS_METHOD_NUM) {
-		/* ¢¬¤³¤ì¤Ç¡¢Symblic Link ¤Ï¡¢Âç¾æÉפ«¡© */
-		if (!ignore_directory && !verify_mode) {
-			if (noexec) {
-				if (quiet != TRUE)
-					printf("EXTRACT %s (directory)\n", name);
-				return;
-			}
-			/* NAME has trailing SLASH '/', (^_^) */
-			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
-				char            buf[256], *bb1, *bb2;
-				int             l_code;
-				strcpy(buf, name);
-				bb1 = strtok(buf, "|");
-				bb2 = strtok(NULL, "|");
+            unlink(name);
+            remove_extracting_file_when_interrupt = TRUE;
+
+            if ((fp = open_with_make_path(name)) != NULL) {
+#if HAVE_LIBAPPLEFILE
+                if (hdr->extend_type == EXTEND_MACOS && !verify_mode && decode_macbinary_contents) {
+                    /* build temporary file */
+                    tfp = NULL; /* avoid compiler warnings `uninitialized' */
+                    tfp = build_temporary_file();
+
+                    crc = decode_lzhuf(afp, tfp,
+                                       hdr->original_size, hdr->packed_size,
+                                       name, method, &read_size);
+                    fclose(tfp);
+                    decode_macbinary(fp, hdr->original_size, name);
+#ifdef __APPLE__
+                    /* TODO: set resource fork */
+                    /* after processing, "Icon\r" is not needed. */
+                    if (strcmp(basename(name), "Icon\r") == 0) {
+                        unlink(name);
+                    }
+#endif /* __APPLE__ */
+                    unlink(temporary_name);
+                } else {
+                    crc = decode_lzhuf(afp, fp,
+                                       hdr->original_size, hdr->packed_size,
+                                       name, method, &read_size);
+                }
+#else /* HAVE_LIBAPPLEFILE */
+                crc = decode_lzhuf(afp, fp,
+                                   hdr->original_size, hdr->packed_size,
+                                   name, method, &read_size);
+#endif /* HAVE_LIBAPPLEFILE */
+                fclose(fp);
+            }
+            remove_extracting_file_when_interrupt = FALSE;
+            signal(SIGINT, SIG_DFL);
+#ifdef SIGHUP
+            signal(SIGHUP, SIG_DFL);
+#endif
+            if (!fp)
+                return read_size;
+        }
+
+        if (hdr->has_crc && crc != hdr->crc)
+            error("CRC error: \"%s\"", name);
+    }
+    else if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_DIRECTORY
+             || (hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK
+             || method == LZHDIRS_METHOD_NUM) {
+        /* ↑これで、Symbolic Link は、大丈夫か？ */
+        if (!ignore_directory && !verify_mode && !output_to_stdout) {
+            if (noexec) {
+                if (quiet != TRUE)
+                    printf("EXTRACT %s (directory)\n", name);
+                return read_size;
+            }
+            /* NAME has trailing SLASH '/', (^_^) */
+            if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
+                int             l_code;
 
 #ifdef S_IFLNK
-				if (skip_flg == FALSE)  {
-					up_flag = inquire_extract(name);
-					if (up_flag == FALSE && force == FALSE) {
-						return;
-					}
-				} else {
-					if (GETSTAT(bb1, &stbuf) == 0 && force != TRUE) {
-						if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
-							if (quiet != TRUE)
-								printf("%s : Skipped...\n", bb1);
-							return;
-						}
-					}
-				}
-
-				unlink(bb1);
-				l_code = symlink(bb2, bb1);
-				if (l_code < 0) {
-					if (quiet != TRUE)
-						warning("Can't make Symbolic Link : ");
-				}
-				if (quiet != TRUE) {
-					printf("Symbolic Link %s -> %s\n", bb1, bb2);
-				}
-				strcpy(name, bb1);	/* Symbolic's name set */
+                if (skip_flg == FALSE)  {
+                    up_flag = inquire_extract(name);
+                    if (up_flag == FALSE && force == FALSE) {
+                        return read_size;
+                    }
+                } else {
+                    if (GETSTAT(name, &stbuf) == 0 && force != TRUE) {
+                        if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
+                            if (quiet != TRUE)
+                                printf("%s : Skipped...\n", name);
+                            return read_size;
+                        }
+                    }
+                }
+
+                unlink(name);
+                make_parent_path(name);
+                l_code = symlink(hdr->realname, name);
+                if (l_code < 0) {
+                    if (quiet != TRUE)
+                        warning("Can't make Symbolic Link \"%s\" -> \"%s\"",
+                                name, hdr->realname);
+                }
+                if (quiet != TRUE) {
+                    message("Symbolic Link %s -> %s",
+                            name, hdr->realname);
+                }
 #else
-				sprintf(buf, "%s -> %s", bb1, bb2);
-				warning("Can't make Symbolic Link", buf);
-				return;
+                warning("Can't make Symbolic Link %s -> %s",
+                        name, hdr->realname);
+                return read_size;
 #endif
-			} else { /* make directory */
-				if (!output_to_stdout && !make_parent_path(name))
-					return;
-			}
-		}
-	}
-	else {
-		error("Unknown information", name);
-	}
-
-	if (!output_to_stdout)
-		adjust_info(name, hdr);
+            }
+            else { /* make directory */
+                if (!make_parent_path(name))
+                    return read_size;
+                /* save directory information */
+                add_dirinfo(name, hdr);
+            }
+        }
+    }
+    else {
+        if (force)              /* force extract */
+            goto extract_regular;
+        else
+            error("Unknown file type: \"%s\". use `f' option to force extract.", name);
+    }
+
+    if (!output_to_stdout && !verify_mode) {
+        if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_DIRECTORY)
+            adjust_info(name, hdr);
+    }
+
+    return read_size;
+}
+
+static int
+skip_to_nextpos(FILE *fp, off_t pos, off_t off, off_t read_size)
+{
+    if (pos != -1) {
+        if (fseeko(fp, pos + off, SEEK_SET) != 0) {
+            return -1;
+        }
+    }
+    else {
+        off_t i = off - read_size;
+        while (i--) {
+            if (fgetc(fp) == EOF) {
+                return -1;
+            }
+        }
+    }
+    return 0;
 }
 
 /* ------------------------------------------------------------------------ */
-/* EXTRACT COMMAND MAIN														*/
+/* EXTRACT COMMAND MAIN                                                     */
 /* ------------------------------------------------------------------------ */
 void
 cmd_extract()
 {
-	LzHeader        hdr;
-	long            pos;
-	FILE           *afp;
-
-	/* open archive file */
-	if ((afp = open_old_archive()) == NULL)
-		fatal_error(archive_name);
-
-	if (archive_is_msdos_sfx1(archive_name))
-		skip_msdos_sfx1_code(afp);
-
-	/* extract each files */
-	while (get_header(afp, &hdr)) {
-		if (need_file(hdr.name)) {
-			pos = ftell(afp);
-			extract_one(afp, &hdr);
-			fseek(afp, pos + hdr.packed_size, SEEK_SET);
-		} else {
-			if (afp != stdin)
-				fseek(afp, hdr.packed_size, SEEK_CUR);
-			else {
-				int             i = hdr.packed_size;
-				while (i--)
-					fgetc(afp);
-			}
-		}
-	}
-
-	/* close archive file */
-	fclose(afp);
-
-	return;
+    LzHeader        hdr;
+    off_t           pos;
+    FILE           *afp;
+    off_t read_size;
+
+    /* open archive file */
+    if ((afp = open_old_archive()) == NULL)
+        fatal_error("Cannot open archive file \"%s\"", archive_name);
+
+    if (archive_is_msdos_sfx1(archive_name))
+        seek_lha_header(afp);
+
+    /* extract each files */
+    while (get_header(afp, &hdr)) {
+        pos = ftello(afp);
+        if (need_file(hdr.name)) {
+            read_size = extract_one(afp, &hdr);
+            if (read_size != hdr.packed_size) {
+                /* when error occurred in extract_one(), should adjust
+                   point of file stream */
+                if (skip_to_nextpos(afp, pos, hdr.packed_size, read_size) == -1) {
+                    fatal_error("Cannot seek to next header position from \"%s\"", hdr.name);
+                }
+            }
+        } else {
+            if (skip_to_nextpos(afp, pos, hdr.packed_size, 0) == -1) {
+                fatal_error("Cannot seek to next header position from \"%s\"", hdr.name);
+            }
+        }
+    }
+
+    /* close archive file */
+    fclose(afp);
+
+    /* adjust directory information */
+    adjust_dirinfo();
+
+    return;
+}
+
+int
+is_directory_traversal(char *path)
+{
+    int state = 0;
+
+    for (; *path; path++) {
+        switch (state) {
+        case 0:
+            if (*path == '.') state = 1;
+            else state = 3;
+            break;
+        case 1:
+            if (*path == '.') state = 2;
+            else if (*path == '/') state = 0;
+            else state = 3;
+            break;
+        case 2:
+            if (*path == '/') return 1;
+            else state = 3;
+            break;
+        case 3:
+            if (*path == '/') state = 0;
+            break;
+        }
+    }
+
+    return state == 2;
+}
+
+/*
+ * restore directory information (timestamp, permission and uid/gid).
+ * added by A.Iriyama  2003.12.12
+ */
+
+typedef struct LzHeaderList_t {
+    struct LzHeaderList_t *next;
+    LzHeader hdr;
+} LzHeaderList;
+
+static LzHeaderList *dirinfo;
+
+static void add_dirinfo(char *name, LzHeader *hdr)
+{
+    LzHeaderList *p, *tmp, top;
+
+    if (memcmp(hdr->method, LZHDIRS_METHOD, 5) != 0)
+        return;
+
+    p = xmalloc(sizeof(LzHeaderList));
+
+    memcpy(&p->hdr, hdr, sizeof(LzHeader));
+    strncpy(p->hdr.name, name, sizeof(p->hdr.name));
+    p->hdr.name[sizeof(p->hdr.name)-1] = 0;
+
+#if 0
+    /* push front */
+    {
+        tmp = dirinfo;
+        dirinfo = p;
+        dirinfo->next = tmp;
+    }
+#else
+
+    /*
+      reverse sorted by pathname order
+
+         p->hdr.name = "a"
+
+         dirinfo->hdr.name             = "a/b/d"
+         dirinfo->next->hdr.name       = "a/b/c"
+         dirinfo->next->next->hdr.name = "a/b"
+
+       result:
+
+         dirinfo->hdr.name                   = "a/b/d"
+         dirinfo->next->hdr.name             = "a/b/c"
+         dirinfo->next->next->hdr.name       = "a/b"
+         dirinfo->next->next->next->hdr.name = "a"
+    */
+
+    top.next = dirinfo;
+
+    for (tmp = &top; tmp->next; tmp = tmp->next) {
+        if (strcmp(p->hdr.name, tmp->next->hdr.name) > 0) {
+            p->next = tmp->next;
+            tmp->next = p;
+            break;
+        }
+    }
+    if (tmp->next == NULL) {
+        p->next = NULL;
+        tmp->next = p;
+    }
+
+    dirinfo = top.next;
+#endif
+}
+
+static void adjust_dirinfo()
+{
+    while (dirinfo) {
+        /* message("adjusting [%s]", dirinfo->hdr.name); */
+        adjust_info(dirinfo->hdr.name, &dirinfo->hdr);
+
+        {
+            LzHeaderList *tmp = dirinfo;
+            dirinfo = dirinfo->next;
+            free(tmp);
+        }
+    }
 }
 
-/* Local Variables: */
-/* mode:c */
-/* tab-width:4 */
-/* End: */
+#if HAVE_LIBAPPLEFILE
+static boolean
+decode_macbinary(ofp, size, outPath)
+    FILE *ofp;
+    off_t size;
+    const char *outPath;
+{
+    af_file_t *afp = NULL;
+    FILE *ifp = NULL;
+    unsigned char *datap;
+    size_t dlen;
+
+    if ((afp = af_open(temporary_name)) != NULL) {
+        /* fetch datafork */
+        datap = af_data(afp, &dlen);
+        fwrite(datap, sizeof(unsigned char), dlen, ofp);
+        af_close(afp);
+        return TRUE;
+    } else { /* it may be not encoded in MacBinary */
+        /* try to copy */
+        if ((ifp = fopen(temporary_name, READ_BINARY)) == NULL) {
+            error("Cannot open a temporary file \"%s\"", temporary_name);
+            return FALSE;
+        }
+        copyfile(ifp, ofp, size, 0, 0);
+        fclose(ifp);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+#endif /* HAVE_LIBAPPLEFILE */