summaryrefslogtreecommitdiffstats
path: root/usr.bin/tip
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:41:30 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:41:30 +0000
commita14d555c873398b14776ca4f2c33f9c69617afb9 (patch)
tree350f6f98843363254f9afe467ae0c92d5a9d7f43 /usr.bin/tip
parentf3a2b348daf9fa6063c38d2d69563f732a2f80e7 (diff)
downloadFreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.zip
FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'usr.bin/tip')
-rw-r--r--usr.bin/tip/libacu/courier.c2
-rw-r--r--usr.bin/tip/libacu/hayes.c16
-rw-r--r--usr.bin/tip/libacu/multitech.c30
-rw-r--r--usr.bin/tip/libacu/t3000.c2
-rw-r--r--usr.bin/tip/libacu/tod.c10
-rw-r--r--usr.bin/tip/libacu/unidialer.c44
-rw-r--r--usr.bin/tip/tip/Makefile2
-rw-r--r--usr.bin/tip/tip/acu.c6
-rw-r--r--usr.bin/tip/tip/acutab.c18
-rw-r--r--usr.bin/tip/tip/cmds.c14
-rw-r--r--usr.bin/tip/tip/pathnames.h2
-rw-r--r--usr.bin/tip/tip/remote.c10
-rw-r--r--usr.bin/tip/tip/tipconf.h6
-rw-r--r--usr.bin/tip/tip/uucplock.c2
-rw-r--r--usr.bin/tip/tip/value.c2
15 files changed, 83 insertions, 83 deletions
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index f4aeab3..84c710f 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -269,7 +269,7 @@ coursync()
buf[len] = '\0';
printf("coursync: (\"%s\")\n\r", buf);
#endif
- if (index(buf, '0') ||
+ if (index(buf, '0') ||
(index(buf, 'O') && index(buf, 'K')))
return(1);
}
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 6cc6c06..dcce6a5 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -48,13 +48,13 @@ static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
* before modem is hung up, removal of the DTR signal
* has no effect (except that it prevents the modem from
* recognizing commands).
- * (by Helge Skrivervik, Calma Company, Sunnyvale, CA. 1984)
+ * (by Helge Skrivervik, Calma Company, Sunnyvale, CA. 1984)
*/
/*
* TODO:
* It is probably not a good idea to switch the modem
* state between 'verbose' and terse (status messages).
- * This should be kicked out and we should use verbose
+ * This should be kicked out and we should use verbose
* mode only. This would make it consistent with normal
* interactive use thru the command 'tip dialer'.
*/
@@ -209,23 +209,23 @@ error_rep(c)
case '1':
printf("CONNECT");
break;
-
+
case '2':
printf("RING");
break;
-
+
case '3':
printf("NO CARRIER");
break;
-
+
case '4':
printf("ERROR in input");
break;
-
+
case '5':
printf("CONNECT 1200");
break;
-
+
default:
printf("Unknown Modem error: %c (0x%x)", c, c);
}
@@ -290,7 +290,7 @@ hay_sync()
ioctl(FD, FIONREAD, &len);
if (len) {
len = read(FD, dumbuf, min(len, DUMBUFLEN));
- if (index(dumbuf, '0') ||
+ if (index(dumbuf, '0') ||
(index(dumbuf, 'O') && index(dumbuf, 'K')))
return(1);
#ifdef DEBUG
diff --git a/usr.bin/tip/libacu/multitech.c b/usr.bin/tip/libacu/multitech.c
index 85cd343..41d42b3 100644
--- a/usr.bin/tip/libacu/multitech.c
+++ b/usr.bin/tip/libacu/multitech.c
@@ -57,8 +57,8 @@ static CONST char *reset_command = "\rATZ\r";
static CONST char *init_string = "AT$BA0$SB38400&E1&E4&E13&E15Q0V1X4E0S0=0\r";
static CONST char *escape_sequence = "+++"; /* return to command escape sequence */
static CONST int lock_baud = 1;
-static CONST unsigned int intercharacter_delay = 20;
-static CONST unsigned int intercommand_delay = 250;
+static CONST unsigned int intercharacter_delay = 20;
+static CONST unsigned int intercommand_delay = 250;
static CONST unsigned int escape_guard_time = 250;
static CONST unsigned int reset_delay = 2000;
@@ -91,7 +91,7 @@ int multitech_dialer (register char *num, char *acu)
if (lock_baud)
{
int i;
- if ((i = speed(number(value(BAUDRATE)))) == NULL)
+ if ((i = speed(number(value(BAUDRATE)))) == NULL)
return 0;
ttysetup (i);
}
@@ -112,7 +112,7 @@ badsynch:
#endif
return (0);
}
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
multitech_write_str (FD, echo_off_command); /* turn off echoing */
@@ -125,7 +125,7 @@ badsynch:
acu_flush ();
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
multitech_write_str (FD, init_string);
if (!multitech_swallow ("\r\nOK\r\n"))
@@ -133,7 +133,7 @@ badsynch:
fflush (stdout);
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
multitech_write_str (FD, dial_command);
for (cp = num; *cp; cp++)
@@ -165,9 +165,9 @@ void multitech_disconnect ()
{
/* first hang up the modem*/
ioctl (FD, TIOCCDTR, 0);
- acu_nap (escape_guard_time);
+ acu_nap (escape_guard_time);
ioctl (FD, TIOCSDTR, 0);
- acu_nap (escape_guard_time);
+ acu_nap (escape_guard_time);
/*
* If not strapped for DTR control, try to get command mode.
*/
@@ -326,19 +326,19 @@ static int multitechsync ()
char buf[40];
while (already++ < MAXRETRY) {
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
ioctl (FD, TIOCFLUSH, 0); /* flush any clutter */
multitech_write_str (FD, reset_command); /* reset modem */
bzero(buf, sizeof(buf));
- acu_nap (reset_delay);
+ acu_nap (reset_delay);
ioctl (FD, FIONREAD, &len);
if (len) {
len = read(FD, buf, sizeof(buf));
-#ifdef DEBUG
+#ifdef DEBUG
buf [len] = '\0';
printf("multitechsync: (\"%s\")\n\r", buf);
#endif
- if (index(buf, '0') ||
+ if (index(buf, '0') ||
(index(buf, 'O') && index(buf, 'K')))
return(1);
}
@@ -354,12 +354,12 @@ static int multitechsync ()
* Toggle DTR to force anyone off that might have left
* the modem connected.
*/
- acu_nap (escape_guard_time);
+ acu_nap (escape_guard_time);
ioctl (FD, TIOCCDTR, 0);
- acu_nap (escape_guard_time);
+ acu_nap (escape_guard_time);
ioctl (FD, TIOCSDTR, 0);
}
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
multitech_write_str (FD, reset_command);
return (0);
}
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 1f1a1f0..1c9f472 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -285,7 +285,7 @@ if (len == 0) len = 1;
buf[len] = '\0';
printf("t3000_sync: (\"%s\")\n\r", buf);
#endif
- if (index(buf, '0') ||
+ if (index(buf, '0') ||
(index(buf, 'O') && index(buf, 'K')))
return(1);
}
diff --git a/usr.bin/tip/libacu/tod.c b/usr.bin/tip/libacu/tod.c
index 62ccddc..f585063 100644
--- a/usr.bin/tip/libacu/tod.c
+++ b/usr.bin/tip/libacu/tod.c
@@ -46,27 +46,27 @@ int tod_cmp (const struct timeval *a, const struct timeval *b)
/*
TOD < command
*/
-int tod_lt (const struct timeval *a, const struct timeval *b)
+int tod_lt (const struct timeval *a, const struct timeval *b)
{
return tod_cmp (a, b) < 0;
}
-int tod_gt (const struct timeval *a, const struct timeval *b)
+int tod_gt (const struct timeval *a, const struct timeval *b)
{
return tod_cmp (a, b) > 0;
}
-int tod_lte (const struct timeval *a, const struct timeval *b)
+int tod_lte (const struct timeval *a, const struct timeval *b)
{
return tod_cmp (a, b) <= 0;
}
-int tod_gte (const struct timeval *a, const struct timeval *b)
+int tod_gte (const struct timeval *a, const struct timeval *b)
{
return tod_cmp (a, b) >= 0;
}
-int tod_eq (const struct timeval *a, const struct timeval *b)
+int tod_eq (const struct timeval *a, const struct timeval *b)
{
return tod_cmp (a, b) == 0;
}
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index 0a1f00c..3d2701d 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -85,8 +85,8 @@ static char *init_string;
static char *escape_sequence;
static int hw_flow_control;
static int lock_baud;
-static unsigned int intercharacter_delay;
-static unsigned int intercommand_delay;
+static unsigned int intercharacter_delay;
+static unsigned int intercommand_delay;
static unsigned int escape_guard_time;
static unsigned int reset_delay;
@@ -157,8 +157,8 @@ void dumpmodemparms (char *modem)
print_str (init_string);
print_str (escape_sequence);
print_num (lock_baud);
- print_num (intercharacter_delay);
- print_num (intercommand_delay);
+ print_num (intercharacter_delay);
+ print_num (intercommand_delay);
print_num (escape_guard_time);
print_num (reset_delay);
printf ("\n");
@@ -175,7 +175,7 @@ static int getmodemparms (const char *modem)
ndx = 0;
- if (modempath != NULL)
+ if (modempath != NULL)
db_array [ndx++] = modempath;
db_array [ndx++] = _PATH_MODEMS;
@@ -336,9 +336,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout)
}
}
break;
-
+
case 1:
- if (read (FD, &c, 1) == 1)
+ if (read (FD, &c, 1) == 1)
{
if (c == '\n')
{
@@ -356,9 +356,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout)
}
}
break;
-
+
case 2:
- if (read (FD, &c, 1) == 1)
+ if (read (FD, &c, 1) == 1)
{
if (c == '\r')
++state;
@@ -366,9 +366,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout)
*p++ = c;
}
break;
-
+
case 3:
- if (read (FD, &c, 1) == 1)
+ if (read (FD, &c, 1) == 1)
{
if (c == '\n')
{
@@ -416,7 +416,7 @@ static int unidialer_dialer (register char *num, char *acu)
if (lock_baud) {
int i;
- if ((i = speed(number(value(BAUDRATE)))) == NULL)
+ if ((i = speed(number(value(BAUDRATE)))) == NULL)
return 0;
ttysetup (i);
}
@@ -694,19 +694,19 @@ static int unidialersync ()
char buf[40];
while (already++ < MAXRETRY) {
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
acu_flush (); /* flush any clutter */
unidialer_write_str (FD, reset_command); /* reset modem */
bzero(buf, sizeof(buf));
- acu_nap (reset_delay);
+ acu_nap (reset_delay);
ioctl (FD, FIONREAD, &len);
if (len) {
len = read(FD, buf, sizeof(buf));
-#ifdef DEBUG
+#ifdef DEBUG
buf [len] = '\0';
printf("unidialersync (%s): (\"%s\")\n\r", modem_name, buf);
#endif
- if (index(buf, '0') ||
+ if (index(buf, '0') ||
(index(buf, 'O') && index(buf, 'K')))
return(1);
}
@@ -722,12 +722,12 @@ static int unidialersync ()
* Toggle DTR to force anyone off that might have left
* the modem connected.
*/
- acu_nap (escape_guard_time);
+ acu_nap (escape_guard_time);
ioctl (FD, TIOCCDTR, 0);
- acu_nap (1000);
+ acu_nap (1000);
ioctl (FD, TIOCSDTR, 0);
}
- acu_nap (intercommand_delay);
+ acu_nap (intercommand_delay);
unidialer_write_str (FD, reset_command);
return (0);
}
@@ -747,12 +747,12 @@ static void unidialer_modem_cmd (int fd, const char *cmd)
naptime = oldt.tv_sec * 1000 + oldt.tv_usec / 1000;
if (naptime > intercommand_delay)
{
-#ifdef DEBUG
+#ifdef DEBUG
printf ("unidialer_modem_cmd: suspicious naptime (%u ms)\r\n", naptime);
#endif
naptime = intercommand_delay;
}
-#ifdef DEBUG
+#ifdef DEBUG
printf ("unidialer_modem_cmd: delaying %u ms\r\n", naptime);
#endif
acu_nap (naptime);
@@ -760,7 +760,7 @@ static void unidialer_modem_cmd (int fd, const char *cmd)
unidialer_write_str (fd, cmd);
tod_gettime (&oldt);
newt.tv_sec = 0;
- newt.tv_usec = intercommand_delay;
+ newt.tv_usec = intercommand_delay;
tod_addto (&oldt, &newt);
}
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index e513746..702b52b 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -19,6 +19,6 @@ LINKS= ${BINDIR}/tip
MAN1= tip.1
MAN5= modems.5
SRCS= acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
- remote.c tip.c tipout.c uucplock.c value.c vars.c
+ remote.c tip.c tipout.c uucplock.c value.c vars.c
.include <bsd.prog.mk>
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 54ae4cd..d320249 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -105,7 +105,7 @@ connect()
;
if (*cp)
*cp++ = '\0';
-
+
if (conflag = (*acu->acu_dialer)(phnum, CU)) {
if (CM != NOSTR)
pwrite(FD, CM, size(CM));
@@ -142,7 +142,7 @@ connect()
;
if (*cp)
*cp++ = '\0';
-
+
if (conflag = (*acu->acu_dialer)(phnum, CU)) {
fclose(fd);
if (CM != NOSTR)
@@ -175,7 +175,7 @@ disconnect(reason)
logent(value(HOST), "", acu->acu_name, "call terminated");
if (boolean(value(VERBOSE)))
printf("\r\ndisconnecting...");
- } else
+ } else
logent(value(HOST), "", acu->acu_name, reason);
(*acu->acu_disconnect)();
}
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 3254e8a..c482493 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -38,17 +38,17 @@ static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
#include "tipconf.h"
#include "tip.h"
-extern int df02_dialer(), df03_dialer(),
- biz31f_dialer(),
+extern int df02_dialer(), df03_dialer(),
+ biz31f_dialer(),
biz31w_dialer(),
- biz22f_dialer(),
+ biz22f_dialer(),
biz22w_dialer(),
- ven_dialer(),
- hay_dialer(),
- cour_dialer(),
- multitech_dialer(),
- t3000_dialer(),
- v3451_dialer(),
+ ven_dialer(),
+ hay_dialer(),
+ cour_dialer(),
+ multitech_dialer(),
+ t3000_dialer(),
+ v3451_dialer(),
v831_dialer(),
dn_dialer();
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 3e764a1..9ce6bff 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -94,7 +94,7 @@ flush_remote ()
ioctl (FD, TIOCSETP, &buf); /* wflushtty */
#endif
}
-
+
/*
* FTP - remote ==> local
* get a file from the remote host
@@ -103,7 +103,7 @@ getfl(c)
char c;
{
char buf[256], *cp, *expand();
-
+
putchar(c);
/*
* get the UNIX receiving file's name
@@ -115,7 +115,7 @@ getfl(c)
printf("\r\n%s: cannot creat\r\n", copyname);
return;
}
-
+
/*
* collect parameters
*/
@@ -182,14 +182,14 @@ xfer(buf, fd, eofchars)
quit = 0;
kill(pid, SIGIOT);
read(repdes[0], (char *)&ccc, 1); /* Wait until read process stops */
-
+
/*
* finish command
*/
r = '\r';
pwrite(FD, &r, 1);
do
- read(FD, &c, 1);
+ read(FD, &c, 1);
while ((c&0177) != '\n');
usedefchars ();
@@ -269,14 +269,14 @@ transfer(buf, fd, eofchars)
quit = 0;
kill(pid, SIGIOT);
read(repdes[0], (char *)&ccc, 1); /* Wait until read process stops */
-
+
/*
* finish command
*/
r = '\r';
pwrite(FD, &r, 1);
do
- read(FD, &c, 1);
+ read(FD, &c, 1);
while ((c&0177) != '\n');
usedefchars ();
(void) setjmp(intbuf);
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index 89730a9..ef4197c 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -47,7 +47,7 @@
/* #define _PATH_LOCKDIRNAME "/etc/locks/LCK..%s" */
/* #define _PATH_LOCKDIRNAME "/usr/spool/locks/LCK..%s" */
/* #define _PATH_LOCKDIRNAME "/usr/spool/uucp/LCK/LCK..%s" */
-#define _PATH_LOCKDIRNAME "/var/spool/lock/LCK..%s"
+#define _PATH_LOCKDIRNAME "/var/spool/lock/LCK..%s"
/*
Specify location for system wide databases
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 333a915..1c6e2d4 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -71,9 +71,9 @@ static char *db_array[3] = { _PATH_REMOTE, 0, 0 };
/*
Expand the start tilde sequence at the start of the
specified path. Optionally, free space allocated to
- path before reinitializing it.
+ path before reinitializing it.
*/
-static int
+static int
expand_tilde (char **path, void (*free) (char *p))
{
int rc = 0;
@@ -93,7 +93,7 @@ expand_tilde (char **path, void (*free) (char *p))
strcat (buffer, "/");
strcat (buffer, tailp);
if (free)
- free (*path);
+ free (*path);
*path = strdup (buffer);
rc++;
}
@@ -137,11 +137,11 @@ getremcap(host)
fprintf(stderr, "tip: unknown host %s\n", host);
break;
case -2:
- fprintf(stderr,
+ fprintf(stderr,
"tip: can't open host description file\n");
break;
case -3:
- fprintf(stderr,
+ fprintf(stderr,
"tip: possible reference loop in host description file\n");
break;
}
diff --git a/usr.bin/tip/tip/tipconf.h b/usr.bin/tip/tip/tipconf.h
index b50c5ef..f21be62 100644
--- a/usr.bin/tip/tip/tipconf.h
+++ b/usr.bin/tip/tip/tipconf.h
@@ -34,7 +34,7 @@
*/
#ifndef tipconf_h_included
-#define tipconf_h_included
+#define tipconf_h_included
/*
Define constness
@@ -47,7 +47,7 @@
#define DEFBR 1200
/*
- Default frame size for file transfer buffering of writes
+ Default frame size for file transfer buffering of writes
on local side
*/
#ifndef BUFSIZ
@@ -78,7 +78,7 @@
#define HAVE_HDB_LOCKFILES 1
/*
- System has a millisecond based sleep function
+ System has a millisecond based sleep function
*/
#define HAVE_USLEEP 0
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index 235f516..a61e124 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
static int put_pid (int fd, int pid);
static int get_pid (int fd);
-/*
+/*
* uucp style locking routines
* return: 0 - success
* -1 - failure
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index ce29a21..7823805 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -339,7 +339,7 @@ vstring(s,v)
register value_t *p;
char *expand();
- p = vlookup(s);
+ p = vlookup(s);
if (p == 0)
return (1);
if (p->v_type&NUMBER)
OpenPOWER on IntegriCloud