nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-10-05 08:40:38 -04:00
parent 2f49d34019 a9e8348dfa
commit f7dded60b3
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
util/dlb_main.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dlb_main.c $NHDT-Date: 1432512785 2015/05/25 00:13:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */ /* NetHack 3.6 dlb_main.c $NHDT-Date: 1570258542 2019/10/05 06:55:42 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.13 $ */
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1993. */ /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1993. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -15,7 +15,7 @@
#endif #endif
static void FDECL(grow_ld, (libdir **, int *, int)); static void FDECL(grow_ld, (libdir **, int *, int));
static void FDECL(xexit, (int)); static void FDECL(xexit, (int)) NORETURN;
#ifdef DLB #ifdef DLB
#ifdef DLBLIB #ifdef DLBLIB
@@ -31,10 +31,9 @@ char *FDECL(eos, (char *)); /* also used by dlb.c */
FILE *FDECL(fopen_datafile, (const char *, const char *)); FILE *FDECL(fopen_datafile, (const char *, const char *));
static void FDECL(Write, (int, char *, long)); static void FDECL(Write, (int, char *, long));
static void NDECL(usage); static void NDECL(usage) NORETURN;
static void NDECL(verbose_help); static void NDECL(verbose_help) NORETURN;
static void FDECL(write_dlb_directory, static void FDECL(write_dlb_directory, (int, int, libdir *, long, long, long));
(int, int, libdir *, long, long, long));
static char default_progname[] = "dlb"; static char default_progname[] = "dlb";
static char *progname = default_progname; static char *progname = default_progname;
@@ -84,12 +83,13 @@ usage()
(void) printf(" default library is %s\n", library_file); (void) printf(" default library is %s\n", library_file);
(void) printf(" default list file is %s\n", list_file); (void) printf(" default list file is %s\n", list_file);
xexit(EXIT_FAILURE); xexit(EXIT_FAILURE);
/*NOTREACHED*/
} }
static void static void
verbose_help() verbose_help()
{ {
static const char *long_help[] = { static const char *const long_help[] = {
"", "dlb COMMANDoptions args... files...", " commands:", "", "dlb COMMANDoptions args... files...", " commands:",
" dlb ? print this text", " dlb h ditto", " dlb ? print this text", " dlb h ditto",
" dlb x extract all files", " dlb c create the archive", " dlb x extract all files", " dlb c create the archive",
@@ -100,11 +100,12 @@ verbose_help()
" C dir change directory before processing any files", "", " C dir change directory before processing any files", "",
(char *) 0 (char *) 0
}; };
const char **str; const char *const *str;
for (str = long_help; *str; str++) for (str = long_help; *str; str++)
(void) printf("%s\n", *str); (void) printf("%s\n", *str);
usage(); usage();
/*NOTREACHED*/
} }
static void static void
@@ -180,11 +181,14 @@ char **argv;
switch (argv[1][cp]) { switch (argv[1][cp]) {
default: default:
usage(); /* doesn't return */ usage(); /* doesn't return */
/*NOTREACHED*/
break;
case '-': /* silently ignore */ case '-': /* silently ignore */
break; break;
case '?': case '?':
case 'h': case 'h':
verbose_help(); verbose_help();
/*NOTREACHED*/
break; break;
case 'I': case 'I':
if (ap == argc) if (ap == argc)
@@ -243,7 +247,9 @@ char **argv;
default: default:
printf("Internal error - action.\n"); printf("Internal error - action.\n");
xexit(EXIT_FAILURE); xexit(EXIT_FAILURE);
/*NOTREACHED*/
break; break;
case 't': /* list archive */ case 't': /* list archive */
if (!open_library(library_file, &lib)) { if (!open_library(library_file, &lib)) {
printf("Can't open dlb file\n"); printf("Can't open dlb file\n");
@@ -263,7 +269,8 @@ char **argv;
lib.nentries, lib.strsize); lib.nentries, lib.strsize);
close_library(&lib); close_library(&lib);
xexit(EXIT_SUCCESS); /* xexit(EXIT_SUCCESS); */
break;
case 'x': { /* extract archive contents */ case 'x': { /* extract archive contents */
int f, n; int f, n;
@@ -331,7 +338,8 @@ char **argv;
} }
close_library(&lib); close_library(&lib);
xexit(EXIT_SUCCESS); /* xexit(EXIT_SUCCESS); */
break;
} }
case 'c': /* create archive */ case 'c': /* create archive */
@@ -403,8 +411,8 @@ char **argv;
} }
/* open output file */ /* open output file */
out = out = open(library_file,
open(library_file, O_RDWR | O_TRUNC | O_BINARY | O_CREAT, FCMASK); O_RDWR | O_TRUNC | O_BINARY | O_CREAT, FCMASK);
if (out < 0) { if (out < 0) {
printf("Can't open %s for output\n", library_file); printf("Can't open %s for output\n", library_file);
xexit(EXIT_FAILURE); xexit(EXIT_FAILURE);
@@ -462,9 +470,10 @@ char **argv;
free((genericptr_t) ld), ldlimit = 0; free((genericptr_t) ld), ldlimit = 0;
(void) close(out); (void) close(out);
xexit(EXIT_SUCCESS); /* xexit(EXIT_SUCCESS); */
} break;
} } /* case 'c' */
} /* switch */
#endif /* DLBLIB */ #endif /* DLBLIB */
#endif /* DLB */ #endif /* DLB */
@@ -540,6 +549,7 @@ int retcd;
#endif #endif
#endif #endif
exit(retcd); exit(retcd);
/*NOTREACHED*/
} }
#ifdef AMIGA #ifdef AMIGA