/* Ver. 1.14 Source All chagned 1995.01.14 N.Watazaki */
/* Ver. 1.14b,c Bug Fixed 1996.03.07 t.okamoto */
/* Ver. 1.14d Version up 1997.01.12 t.okamoto */
-/* Ver. 1.14f Bug Fixed 1999.07.19 t.okamoto */
+/* Ver. 1.14g Bug Fixed 2000.05.06 t.okamoto */
+/* Ver. 1.14i Modified 2000.10.06 t.okamoto */
/* ------------------------------------------------------------------------ */
#define LHA_MAIN_SRC
/* static functions */
static void sort_files();
+static void print_version();
char *extract_directory = NULL;
char **xfilev;
noexec = FALSE; /* debugging option */
force = FALSE;
prof = FALSE;
-#ifndef SUPPORT_LH6
+#ifndef SUPPORT_LH7
compress_method = LZHUFF5_METHOD_NUM;
#endif
-#ifdef SUPPORT_LH6
- compress_method = LZHUFF6_METHOD_NUM;
+#ifdef SUPPORT_LH7
+ compress_method = LZHUFF7_METHOD_NUM;
#endif
+
+ compress_method = DEFAULT_LZHUFF_METHOD;
+
header_level = HEADER_LEVEL1;
quiet_mode = 0;
ignore_directory = FALSE;
verify_mode = FALSE;
+ noconvertcase = FALSE;
+
extract_directory = NULL;
xfilec = 257;
}
LHx(arc) for OSK V 2.01 Modified 1990 Momozou\n\
LHa for UNIX V 1.00 Copyright(C) 1992 Masaru Oki\n\
LHa for UNIX V 1.14 Modified 1995 Nobutaka Watazaki\n\
-LHa for UNIX V 1.14f Modified 1999 Tsugio Okamoto\n\
+LHa for UNIX V 1.14i Modified 2000 Tsugio Okamoto\n\
");
fprintf(stderr, "\
usage: lha [-]{axelvudmcp[q[num]][vnfodizg012]}[w=<dir>] archive_file [file...]\n\
x,e EXtract from archive v verbose\n\
l,v List / Verbose List n not execute\n\
u Update newer files to archive f force (over write at extract)\n\
- d Delete from archive t FILES are TEXT file\n\
- m Move to archive (means 'ad') o[56] compression method (a/u)\n\
+ d Delete from archive t FILES are TEXT file\n");
+#ifdef SUPPORT_LH7
+ fprintf(stderr, "\
+ m Move to archive (means 'ad') o[567] compression method (a/u)\n\
+");
+#endif
+#ifndef SUPPORT_LH7
+ fprintf(stderr, "\
+ m Move to archive (means 'ad') o use LHarc compatible method (a/u)\n\
+");
+#endif
+ fprintf(stderr, "\
c re-Construct new archive w=<dir> specify extract directory (a/u/m/x/e)\n\
p Print to STDOUT from archive d delete FILES after (a/u/c)\n\
t Test file CRC in archive i ignore directory path (x/e)\n\
z files not compress (a/u)\n\
- g [Generic] format (for compatibility)\n\
+ g Generic format (for compatibility)\n\
+ or not convert case when extracting\n\
0/1/2 header level (a/u)\n\
");
#ifdef EUC
init_variable(); /* Added N.Watazaki */
ac = argc;
- av = (char **)malloc( sizeof(char*)*argc );
- if (av == NULL) fatal_error("not enough memory\n");
+ av = (char **)xmalloc( sizeof(char*)*argc );
for (i=0; i<argc; i++) {
- if ((av[i] = strdup( argv[i] )) == NULL)
- fatal_error("not enough memory\n");
+ av[i] = xstrdup( argv[i] );
}
if (ac < 2)
print_tiny_usage_and_exit();
+
+ if (strcmp(av[1], "--version") == 0) {
+ print_version();
+ exit(1);
+ }
+
if (ac < 3) {
cmd = CMD_LIST;
av--; /* argv--; */ /* 1999.7.18 */
break;
case 'g':
generic_format = TRUE;
+ noconvertcase = TRUE;
header_level = 0;
break;
case 'd':
case 'o':
switch (*p) {
case 0:
- compress_method = LZHUFF1_METHOD_NUM;
- header_level = 0;
- break;
+ compress_method = LZHUFF1_METHOD_NUM;
+ header_level = 0;
+ break;
case '5':
- compress_method = LZHUFF5_METHOD_NUM;
- p++;
- break;
+ compress_method = LZHUFF5_METHOD_NUM;
+ p++;
+ break;
+#ifdef SUPPORT_LH7
case '6':
- compress_method = LZHUFF6_METHOD_NUM;
- p++;
- break;
+ compress_method = LZHUFF6_METHOD_NUM;
+ p++;
+ break;
+ case '7':
+ compress_method = LZHUFF7_METHOD_NUM;
+ p++;
+ break;
+#endif
default:
- fprintf(stderr, "LHa: error option o%c\n", p[-1]);
- exit(1);
+ fprintf(stderr, "LHa: error option o%c\n", p[-1]);
+ exit(1);
}
- break;
+ break;
case 'z':
compress_method = LZHUFF0_METHOD_NUM; /* Changed N.Watazaki */
break;
/* target file name */
if (get_filename_from_stdin) {
cmd_filec = 0;
- if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL)
- fatal_error("Virtual memory exhausted\n");
+ xfilev = (char **)xmalloc(sizeof(char *) * xfilec);
while (fgets(inpbuf, sizeof(inpbuf), stdin)) {
/* delete \n if it exist */
- i=0; p=inpbuf;
+ i=0; p=inpbuf;
while (i < sizeof(inpbuf) && p != 0) {
if (*p == '\n') {
*p = 0;
}
if (strlen(inpbuf) < 1)
continue;
- if ((xfilev[cmd_filec++] = (char *) strdup(inpbuf)) == NULL)
- fatal_error("Virtual memory exhausted\n");
+ xfilev[cmd_filec++] = xstrdup(inpbuf);
}
xfilev[cmd_filec] = NULL;
cmd_filev = xfilev;
return 0;
}
+
+/* ------------------------------------------------------------------------ */
+/* */
+/* ------------------------------------------------------------------------ */
+
+/* ------------------------------------------------------------------------ */
+static void
+print_version()
+{
+ fprintf(stderr, "%s\n", LHA_VERSION);
+}
+
/* ------------------------------------------------------------------------ */
static void
message_1(title, subject, name)
unlink(writting_filename);
}
signal(SIGINT, SIG_DFL);
+#ifdef SIGHUP
signal(SIGHUP, SIG_DFL);
+#endif
kill(getpid(), signo);
}
return p;
}
+char *
+xstrdup(str)
+ char *str;
+{
+ int len = strlen(str);
+ char *p = (char *)xmalloc(str + 1);
+ if (!p)
+ fatal_error("Not enough memory");
+ strcpy(p, str);
+ return p;
+}
+
/* ------------------------------------------------------------------------ */
/* STRING POOL */
/* ------------------------------------------------------------------------ */
else {
sprintf(temporary_name, "%s/lhXXXXXX", extract_directory);
}
+#ifdef HAVE_MKSTEMP
+ mkstemp(temporary_name);
+#else
mktemp(temporary_name);
+#endif
#else
char *p, *s;
if (*p == '/')
s = p;
strcpy((s ? s + 1 : temporary_name), "lhXXXXXX");
+#ifdef HAVE_MKSTEMP
+ mkstemp(temporary_name);
+#else
mktemp(temporary_name);
#endif
+#endif
}
/* ------------------------------------------------------------------------ */
else {
reading_filename = archive_name;
writting_filename = temporary_name;
- copyfile(oafp, nafp, (long) (hdr->header_size + 2) + hdr->packed_size, 0);
+ if (hdr->header_level != 2) {
+ copyfile(oafp, nafp,
+ (long) (hdr->header_size + 2) + hdr->packed_size, 0);
+ } else {
+ copyfile(oafp, nafp,
+ (long) (hdr->header_size) + hdr->packed_size, 0);
+ }
}
}
/* Local Variables: */
-/* tab-width : 4 */
+/* mode:c */
+/* tab-width:4 */
+/* compile-command:"gcc -c lharc.c" */
/* End: */
OSDN Git Service
