From cc59786ed6530741932dd66cc5661449d6d6b3f6 Mon Sep 17 00:00:00 2001 From: Serge Date: Fri, 27 May 2022 18:32:55 -0700 Subject: [PATCH] Update man, md5 and med. --- include/curses.h | 6 ++--- include/vmf.h | 4 +-- src/cmd/man/man.c | 34 ++++++++++++++---------- src/cmd/md5/md5.c | 8 +++--- src/cmd/med/med.c | 67 ++++++++++++++++++++++------------------------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/include/curses.h b/include/curses.h index c9640ec..c208640 100644 --- a/include/curses.h +++ b/include/curses.h @@ -84,17 +84,17 @@ extern WINDOW *stdscr, *curscr; int __void__; #define VOID(x) (__void__ = (int) (x)) #else -#define VOID(x) (x) +#define VOID(x) ((void)(x)) #endif /* * psuedo functions for standard screen */ #define addch(ch) VOID(waddch(stdscr, ch)) -#define getch() VOID(wgetch(stdscr)) +#define getch() wgetch(stdscr) #define addstr(str) VOID(waddstr(stdscr, str)) #define getstr(str) VOID(wgetstr(stdscr, str)) -#define move(y, x) VOID(wmove(stdscr, y, x)) +#define move(y, x) wmove(stdscr, y, x) #define clear() VOID(wclear(stdscr)) #define erase() VOID(werase(stdscr)) #define clrtobot() VOID(wclrtobot(stdscr)) diff --git a/include/vmf.h b/include/vmf.h index ed2a503..6039bd3 100644 --- a/include/vmf.h +++ b/include/vmf.h @@ -48,8 +48,8 @@ struct vseg { /* structure of a segment in memory */ /* masks for s_flags */ #define S_DIRTY 01 /* segment has been modified */ -long nswaps; /* number of swaps */ -long nmapsegs; /* number of mapseg calls */ +extern long nswaps; /* number of swaps */ +extern long nmapsegs; /* number of mapseg calls */ int vminit(), vmopen(); struct vseg *vmmapseg(); diff --git a/src/cmd/man/man.c b/src/cmd/man/man.c index bc27f92..8a8c908 100644 --- a/src/cmd/man/man.c +++ b/src/cmd/man/man.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #define NEW_PATH "/new/man" @@ -63,7 +65,7 @@ static MANDIR list3[2]; /* single section */ * cat -- * cat out the file */ -static +static void cat(fname) char *fname; { @@ -90,7 +92,7 @@ cat(fname) * add -- * add a file name to the list for future paging */ -static +static void add(fname) char *fname; { @@ -127,7 +129,7 @@ add(fname) * matches; check ${directory}/${dir}/{file name} and * ${directory}/${dir}/${machine}/${file name}. */ -static +static int manual(section, name) MANDIR *section; char *name; @@ -140,7 +142,7 @@ manual(section, name) if (strlen(name) > MAXNAMLEN-2) /* leave room for the ".0" */ name[MAXNAMLEN-2] = '\0'; for (beg = manpath, res = 0;; beg = end + 1) { - if (end = index(beg, ':')) + if ((end = index(beg, ':'))) *end = '\0'; for (dp = section; dp->name; ++dp) { (void)sprintf(fname, "%s/%s/%s.0", beg, dp->name, name); @@ -165,6 +167,7 @@ manual(section, name) *end = ':'; } /*NOTREACHED*/ + return 0; } /* @@ -230,7 +233,7 @@ getsect(s) return((MANDIR *)NULL); } -static +static void man(argv) char **argv; { @@ -276,7 +279,7 @@ man(argv) break; case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': - if (section = getsect(*argv)) + if ((section = getsect(*argv))) ++argv; } @@ -315,7 +318,7 @@ man(argv) * jump -- * strip out flag argument and jump */ -static +static void jump(argv, flag, name) char **argv, *name; register char *flag; @@ -337,26 +340,28 @@ jump(argv, flag, name) * This is done in a function by itself because 'uname()' uses a 640 * structure which we do not want permanently allocated on main()'s stack. */ +static void setmachine() - { - struct utsname foo; +{ + struct utsname foo; - if (uname(&foo) < 0) + if (uname(&foo) < 0) strcpy(foo.machine, "?"); machine = strdup(foo.machine); - } +} /* * usage -- * print usage and die */ -static +static void usage() { fputs("usage: man [-] [-a] [-M path] [section] title ...\n", stderr); exit(1); } +int main(argc, argv) int argc; register char **argv; @@ -403,10 +408,10 @@ main(argc, argv) if (!*argv) usage(); - if (!(how & CAT)) + if (!(how & CAT)) { if (!isatty(1)) how |= CAT; - else if (pager = getenv("PAGER")) { + else if ((pager = getenv("PAGER"))) { register char *p; /* @@ -433,6 +438,7 @@ main(argc, argv) } else pager = _PATH_MORE " -s"; + } if (!(machine = getenv("MACHINE"))) setmachine(); if (!defpath && !(defpath = getenv("MANPATH"))) diff --git a/src/cmd/md5/md5.c b/src/cmd/md5/md5.c index ed73ab2..7db107c 100644 --- a/src/cmd/md5/md5.c +++ b/src/cmd/md5/md5.c @@ -106,7 +106,7 @@ char *string; unsigned int len = strlen (string); MDInit (&context); - MDUpdate (&context, string, len); + MDUpdate (&context, (const unsigned char*) string, len); MDFinal (digest, &context); printf ("MD%d (\"%s\") = ", MD, string); @@ -190,7 +190,7 @@ char *filename; else { MDInit (&context); - while (len = fread (buffer, 1, 1024, file)) + while ((len = fread (buffer, 1, 1024, file))) MDUpdate (&context, buffer, len); MDFinal (digest, &context); @@ -211,8 +211,8 @@ static void MDFilter () unsigned char buffer[16], digest[16]; MDInit (&context); - while (len = fread (buffer, 1, 16, stdin)) - MDUpdate (&context, buffer, len); + while ((len = fread (buffer, 1, 16, stdin))) + MDUpdate (&context, buffer, len); MDFinal (digest, &context); MDPrint (digest); diff --git a/src/cmd/med/med.c b/src/cmd/med/med.c index 37faff6..adb332e 100644 --- a/src/cmd/med/med.c +++ b/src/cmd/med/med.c @@ -162,7 +162,7 @@ void refresh_screen() mvwaddstr(win,screen_height,0,temp); standend(); - + mvwinch(win,cursor_line,cpos); refresh(); } @@ -239,7 +239,7 @@ void save_file(char *fn) file = fopen(fn,"w"); if(!file) - return; + return; for(i=0; i= strlen(seg->s_cinfo)) cursor_column = strlen(seg->s_cinfo); refresh_screen(); - break; + break; case KEY_DOWN: if(cursor_line+offset_lines_cinfo); refresh_screen(); } - break; + break; case KEY_RIGHT: cursor_column++; seg = vmmapseg(&space,offset_line+cursor_line); @@ -520,7 +515,7 @@ int main(int argc, char **argv) refresh_screen(); } } - if(d==CTRL_X) + if(d==CTRL_X) break; }