X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=chat%2Fchat.c;h=64d96c230bfcd943c28e9182711c7fbaee7d20ad;hb=eff574c871822c7e2788aa8a928f2480fa7a6cb3;hp=dc6cf2e3dea8a6fc75f5a4f1f66a40543dd475f2;hpb=a75742c5e72fa5718e57d77586887d58755feebe;p=ppp.git diff --git a/chat/chat.c b/chat/chat.c index dc6cf2e..64d96c2 100644 --- a/chat/chat.c +++ b/chat/chat.c @@ -82,14 +82,6 @@ * */ -#ifndef __STDC__ -#define const -#endif - -#ifndef lint -static const char rcsid[] = "$Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp $"; -#endif - #include #include #include @@ -102,6 +94,7 @@ static const char rcsid[] = "$Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp #include #include #include +#include #ifndef TERMIO #undef TERMIOS @@ -121,20 +114,6 @@ static const char rcsid[] = "$Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp #define SIGTYPE void #endif -#undef __P -#undef __V - -#ifdef __STDC__ -#include -#define __V(x) x -#define __P(x) x -#else -#include -#define __V(x) (va_alist) va_dcl -#define __P(x) () -#define const -#endif - #ifndef O_NONBLOCK #define O_NONBLOCK O_NDELAY #endif @@ -209,43 +188,41 @@ int clear_report_next = 0; int say_next = 0, hup_next = 0; -void *dup_mem __P((void *b, size_t c)); -void *copy_of __P((char *s)); -char *grow __P((char *s, char **p, size_t len)); -void usage __P((void)); -void msgf __P((const char *fmt, ...)); -void fatal __P((int code, const char *fmt, ...)); -SIGTYPE sigalrm __P((int signo)); -SIGTYPE sigint __P((int signo)); -SIGTYPE sigterm __P((int signo)); -SIGTYPE sighup __P((int signo)); -void unalarm __P((void)); -void init __P((void)); -void set_tty_parameters __P((void)); -void echo_stderr __P((int)); -void break_sequence __P((void)); -void terminate __P((int status)); -void do_file __P((char *chat_file)); -int get_string __P((register char *string)); -int put_string __P((register char *s)); -int write_char __P((int c)); -int put_char __P((int c)); -int get_char __P((void)); -void chat_send __P((register char *s)); -char *character __P((int c)); -void chat_expect __P((register char *s)); -char *clean __P((register char *s, int sending)); -void break_sequence __P((void)); -void terminate __P((int status)); -void pack_array __P((char **array, int end)); -char *expect_strtok __P((char *, char *)); -int vfmtmsg __P((char *, int, const char *, va_list)); /* vsprintf++ */ - -int main __P((int, char *[])); - -void *dup_mem(b, c) -void *b; -size_t c; +void *dup_mem (void *b, size_t c); +void *copy_of (char *s); +char *grow (char *s, char **p, size_t len); +void usage (void); +void msgf (const char *fmt, ...); +void fatal (int code, const char *fmt, ...); +SIGTYPE sigalrm (int signo); +SIGTYPE sigint (int signo); +SIGTYPE sigterm (int signo); +SIGTYPE sighup (int signo); +void unalarm (void); +void init (void); +void set_tty_parameters (void); +int echo_stderr (int); +void break_sequence (void); +void terminate (int status); +void do_file (char *chat_file); +int get_string (register char *string); +int put_string (register char *s); +int write_char (int c); +int put_char (int c); +int get_char (void); +int chat_send (register char *s); +char *character (int c); +void chat_expect (register char *s); +char *clean (register char *s, int sending); +void break_sequence (void); +void terminate (int status); +void pack_array (char **array, int end); +char *expect_strtok (char *, char *); +int vfmtmsg (char *, int, const char *, va_list); /* vsprintf++ */ + +int main (int, char *[]); + +void *dup_mem(void *b, size_t c) { void *ans = malloc (c); if (!ans) @@ -255,17 +232,13 @@ size_t c; return ans; } -void *copy_of (s) -char *s; +void *copy_of (char *s) { return dup_mem (s, strlen (s) + 1); } /* grow a char buffer and keep a pointer offset */ -char *grow(s, p, len) -char *s; -char **p; -size_t len; +char *grow(char *s, char **p, size_t len) { size_t l = *p - s; /* save p as distance into s */ @@ -284,9 +257,7 @@ size_t len; * Perform a UUCP-dialer-like chat script on stdin and stdout. */ int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { int option; char *arg; @@ -413,8 +384,7 @@ main(argc, argv) * Process a chat script when read from a file. */ -void do_file (chat_file) -char *chat_file; +void do_file (char *chat_file) { int linect, sendflg; char *sp, *arg, quote; @@ -482,7 +452,7 @@ char *chat_file; /* * We got an error parsing the command line. */ -void usage() +void usage(void) { fprintf(stderr, "\ Usage: %s [-e] [-E] [-v] [-V] [-t timeout] [-r report-file]\n\ @@ -495,55 +465,42 @@ char line[1024]; /* * Send a message to syslog and/or stderr. */ -void msgf __V((const char *fmt, ...)) +void msgf(const char *fmt, ...) { va_list args; -#ifdef __STDC__ va_start(args, fmt); -#else - char *fmt; - va_start(args); - fmt = va_arg(args, char *); -#endif vfmtmsg(line, sizeof(line), fmt, args); if (to_log) syslog(LOG_INFO, "%s", line); if (to_stderr) fprintf(stderr, "%s\n", line); + va_end(args); } /* * Print an error message and terminate. */ -void fatal __V((int code, const char *fmt, ...)) +void fatal(int code, const char *fmt, ...) { va_list args; -#ifdef __STDC__ va_start(args, fmt); -#else - int code; - char *fmt; - va_start(args); - code = va_arg(args, int); - fmt = va_arg(args, char *); -#endif vfmtmsg(line, sizeof(line), fmt, args); if (to_log) syslog(LOG_ERR, "%s", line); if (to_stderr) fprintf(stderr, "%s\n", line); + va_end(args); terminate(code); } int alarmed = 0; -SIGTYPE sigalrm(signo) -int signo; +SIGTYPE sigalrm(int signo) { int flags; @@ -561,7 +518,7 @@ int signo; msgf("alarm"); } -void unalarm() +void unalarm(void) { int flags; @@ -572,25 +529,22 @@ void unalarm() fatal(2, "Can't set file mode flags on stdin: %m"); } -SIGTYPE sigint(signo) -int signo; +SIGTYPE sigint(int signo) { fatal(2, "SIGINT"); } -SIGTYPE sigterm(signo) -int signo; +SIGTYPE sigterm(int signo) { fatal(2, "SIGTERM"); } -SIGTYPE sighup(signo) -int signo; +SIGTYPE sighup(int signo) { fatal(2, "SIGHUP"); } -void init() +void init(void) { signal(SIGINT, sigint); signal(SIGTERM, sigterm); @@ -602,7 +556,7 @@ void init() alarmed = 0; } -void set_tty_parameters() +void set_tty_parameters(void) { #if defined(get_term_param) term_parms t; @@ -626,15 +580,14 @@ void set_tty_parameters() #endif } -void break_sequence() +void break_sequence(void) { #ifdef TERMIOS tcsendbreak (0, 0); #endif } -void terminate(status) -int status; +void terminate(int status) { static int terminating = 0; @@ -681,9 +634,8 @@ int status; /* * 'Clean up' this string. */ -char *clean(s, sending) -register char *s; -int sending; /* set to 1 when sending (putting) this string. */ +char *clean(register char *s, + int sending) /* set to 1 when sending (putting) this string. */ { char cur_chr; char *s1, *p, *phchar; @@ -868,8 +820,7 @@ int sending; /* set to 1 when sending (putting) this string. */ * A modified version of 'strtok'. This version skips \ sequences. */ -char *expect_strtok (s, term) - char *s, *term; +char *expect_strtok (char *s, char *term) { static char *str = ""; int escape_flag = 0; @@ -923,8 +874,7 @@ char *expect_strtok (s, term) * Process the expect string */ -void chat_expect (s) -char *s; +void chat_expect (char *s) { char *expect; char *reply; @@ -1012,8 +962,7 @@ char *s; * the data. */ -char *character(c) -int c; +char *character(int c) { static char string[10]; char *meta; @@ -1034,17 +983,18 @@ int c; /* * process the reply string */ -void chat_send (s) -register char *s; +int chat_send (register char *s) { char file_data[STR_LEN]; + int len, ret = 0; if (say_next) { say_next = 0; s = clean(s, 1); - write(2, s, strlen(s)); + len = strlen(s); + ret = write(2, s, len) != len; free(s); - return; + return ret; } if (hup_next) { @@ -1053,13 +1003,13 @@ register char *s; signal(SIGHUP, SIG_IGN); else signal(SIGHUP, sighup); - return; + return 0; } if (echo_next) { echo_next = 0; echo = (strcmp(s, "ON") == 0); - return; + return 0; } if (abort_next) { @@ -1072,15 +1022,14 @@ register char *s; s1 = clean(s, 0); - if (strlen(s1) > strlen(s) - || strlen(s1) + 1 > sizeof(fail_buffer)) + if (strlen(s1) + 1 > sizeof(fail_buffer)) fatal(1, "Illegal or too-long ABORT string ('%v')", s); abort_string[n_aborts++] = s1; if (verbose) - msgf("abort on (%v)", s); - return; + msgf("abort on (%v)", s1); + return 0; } if (clear_abort_next) { @@ -1093,8 +1042,7 @@ register char *s; s1 = clean(s, 0); - if (strlen(s1) > strlen(s) - || strlen(s1) + 1 > sizeof(fail_buffer)) + if (strlen(s1) + 1 > sizeof(fail_buffer)) fatal(1, "Illegal or too-long CLR_ABORT string ('%v')", s); old_max = n_aborts; @@ -1105,13 +1053,13 @@ register char *s; pack++; n_aborts--; if (verbose) - msgf("clear abort on (%v)", s); + msgf("clear abort on (%v)", s1); } } free(s1); if (pack) pack_array(abort_string,old_max); - return; + return 0; } if (report_next) { @@ -1122,15 +1070,14 @@ register char *s; fatal(2, "Too many REPORT strings"); s1 = clean(s, 0); - if (strlen(s1) > strlen(s) - || strlen(s1) + 1 > sizeof(fail_buffer)) + if (strlen(s1) + 1 > sizeof(fail_buffer)) fatal(1, "Illegal or too-long REPORT string ('%v')", s); report_string[n_reports++] = s1; if (verbose) - msgf("report (%v)", s); - return; + msgf("report (%v)", s1); + return 0; } if (clear_report_next) { @@ -1143,8 +1090,7 @@ register char *s; s1 = clean(s, 0); - if (strlen(s1) > strlen(s) - || strlen(s1) + 1 > sizeof(fail_buffer)) + if (strlen(s1) + 1 > sizeof(fail_buffer)) fatal(1, "Illegal or too-long REPORT string ('%v')", s); old_max = n_reports; @@ -1155,18 +1101,19 @@ register char *s; pack++; n_reports--; if (verbose) - msgf("clear report (%v)", s); + msgf("clear report (%v)", s1); } } free(s1); if (pack) pack_array(report_string,old_max); - return; + return 0; } if (timeout_next) { timeout_next = 0; + s = clean(s, 0); timeout = atoi(s); if (timeout <= 0) @@ -1175,7 +1122,7 @@ register char *s; if (verbose) msgf("timeout set to %d seconds", timeout); - return; + return 0; } /* @@ -1222,9 +1169,11 @@ register char *s; if (!put_string(s)) fatal(1, "Failed"); + + return 0; } -int get_char() +int get_char(void) { int status; char c; @@ -1249,8 +1198,7 @@ int get_char() } } -int put_char(c) -int c; +int put_char(int c) { int status; char ch = c; @@ -1277,8 +1225,7 @@ int c; } } -int write_char (c) -int c; +int write_char(int c) { if (alarmed || put_char(c) < 0) { alarm(0); @@ -1295,15 +1242,14 @@ int c; return (1); } -int put_string (s) -register char *s; +int put_string(register char *s) { quiet = 0; s = clean(s, 1); if (verbose) { if (quiet) - msgf("send (??????)"); + msgf("send (?????\?)"); else msgf("send (%v)", s); } @@ -1350,11 +1296,11 @@ register char *s; * When called with -1, a '\n' character is generated when * the cursor is not at the beginning of a line. */ -void echo_stderr(n) -int n; +int echo_stderr(int n) { static int need_lf; char *s; + int len, ret = 0; switch (n) { case '\r': /* ignore '\r' */ @@ -1364,22 +1310,23 @@ int n; break; /* fall through */ case '\n': - write(2, "\n", 1); + ret = write(2, "\n", 1) != 1; need_lf = 0; break; default: s = character(n); - write(2, s, strlen(s)); + len = strlen(s); + ret = write(2, s, len) != len; need_lf = 1; break; } + return ret; } /* * 'Wait for' this string to appear on this file descriptor. */ -int get_string(string) -register char *string; +int get_string(register char *string) { char temp[STR_LEN]; int c, printed = 0, len, minlen; @@ -1412,8 +1359,11 @@ register char *string; while ( ! alarmed && (c = get_char()) >= 0) { int n, abort_len, report_len; - if (echo) - echo_stderr(c); + if (echo) { + if (echo_stderr(c) != 0) { + fatal(2, "Could not write to stderr, %m"); + } + } if (verbose && c == '\n') { if (s == logged) msgf(""); /* blank line */ @@ -1547,9 +1497,8 @@ register char *string; extern int select(); -int -usleep( usec ) /* returns 0 if ok, else -1 */ - long usec; /* delay in microseconds */ +/* returns 0 if ok, else -1 */ +int usleep(long usec) /* delay in microseconds */ { static struct { /* `timeval' */ long tv_sec; /* seconds */ @@ -1563,10 +1512,9 @@ usleep( usec ) /* returns 0 if ok, else -1 */ } #endif -void -pack_array (array, end) - char **array; /* The address of the array of string pointers */ - int end; /* The index of the next free entry before CLR_ */ +void pack_array ( + char **array, /* The address of the array of string pointers */ + int end) /* The index of the next free entry before CLR_ */ { int i, j; @@ -1592,11 +1540,7 @@ pack_array (array, end) #define OUTCHAR(c) (buflen > 0? (--buflen, *buf++ = (c)): 0) int -vfmtmsg(buf, buflen, fmt, args) - char *buf; - int buflen; - const char *fmt; - va_list args; +vfmtmsg(char *buf, int buflen, const char *fmt, va_list args) { int c, i, n; int width, prec, fillch;