diff options
Diffstat (limited to 'contrib/less/lesskey.c')
| -rw-r--r-- | contrib/less/lesskey.c | 65 |
1 files changed, 26 insertions, 39 deletions
diff --git a/contrib/less/lesskey.c b/contrib/less/lesskey.c index b5130cccb8f7..61311c7ef0c0 100644 --- a/contrib/less/lesskey.c +++ b/contrib/less/lesskey.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2021 Mark Nudelman + * Copyright (C) 1984-2023 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -80,12 +80,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include "defines.h" #include <stdio.h> #include <string.h> #include <stdlib.h> #include "lesskey.h" #include "cmd.h" -#include "defines.h" char fileheader[] = { C0_LESSKEY_MAGIC, @@ -108,38 +108,39 @@ char *outfile = NULL ; extern char version[]; - static void -usage(void) +static void usage(void) { fprintf(stderr, "usage: lesskey [-o output] [input]\n"); exit(1); } - void -lesskey_parse_error(s) - char *s; +void lesskey_parse_error(char *s) { fprintf(stderr, "%s\n", s); } - void * -ecalloc(count, size) - int count; - unsigned int size; +int lstrtoi(char *buf, char **ebuf, int radix) +{ + return (int) strtol(buf, ebuf, radix); +} + +void out_of_memory(void) +{ + fprintf(stderr, "lesskey: cannot allocate memory\n"); + exit(1); +} + +void * ecalloc(int count, unsigned int size) { void *p; p = calloc(count, size); - if (p != NULL) - return (p); - fprintf(stderr, "lesskey: cannot allocate %d bytes of memory\n", count*size); - exit(1); + if (p == NULL) + out_of_memory(); + return (p); } - static char * -mkpathname(dirname, filename) - char *dirname; - char *filename; +static char * mkpathname(char *dirname, char *filename) { char *pathname; @@ -153,9 +154,7 @@ mkpathname(dirname, filename) /* * Figure out the name of a default file (in the user's HOME directory). */ - char * -homefile(filename) - char *filename; +char * homefile(char *filename) { char *p; char *pathname; @@ -177,10 +176,7 @@ homefile(filename) /* * Parse command line arguments. */ - static void -parse_args(argc, argv) - int argc; - char **argv; +static void parse_args(int argc, char **argv) { char *arg; @@ -250,11 +246,7 @@ parse_args(argc, argv) /* * Output some bytes. */ - static void -fputbytes(fd, buf, len) - FILE *fd; - char *buf; - int len; +static void fputbytes(FILE *fd, char *buf, int len) { while (len-- > 0) { @@ -266,10 +258,7 @@ fputbytes(fd, buf, len) /* * Output an integer, in special KRADIX form. */ - static void -fputint(fd, val) - FILE *fd; - unsigned int val; +static void fputint(FILE *fd, unsigned int val) { char c; @@ -285,10 +274,7 @@ fputint(fd, val) fwrite(&c, sizeof(char), 1, fd); } - int -main(argc, argv) - int argc; - char *argv[]; +int main(int argc, char *argv[]) { struct lesskey_tables tables; FILE *out; @@ -366,5 +352,6 @@ main(argc, argv) /* File trailer */ fputbytes(out, endsection, sizeof(endsection)); fputbytes(out, filetrailer, sizeof(filetrailer)); + fclose(out); return (0); } |