Module Name: src
Committed By: mbalmer
Date: Sun Feb 26 10:17:44 UTC 2012
Modified Files:
src/distrib/utils/sysinst: run.c
Log Message:
Fold long lines and a little KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/utils/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/run.c
diff -u src/distrib/utils/sysinst/run.c:1.69 src/distrib/utils/sysinst/run.c:1.70
--- src/distrib/utils/sysinst/run.c:1.69 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/run.c Sun Feb 26 10:17:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.69 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: run.c,v 1.70 2012/02/26 10:17:44 mbalmer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -138,7 +138,8 @@ script_flip(menudesc *m, void *arg)
(void)time(&tloc);
if (script) {
- scripting_fprintf(NULL, "# Script ended at: %s\n", asctime(localtime(&tloc)));
+ scripting_fprintf(NULL, "# Script ended at: %s\n",
+ asctime(localtime(&tloc)));
fflush(script);
fclose(script);
script = NULL;
@@ -150,7 +151,8 @@ script_flip(menudesc *m, void *arg)
asctime(localtime(&tloc)));
fflush(script);
} else {
- msg_display(MSG_openfail, "script file", strerror(errno));
+ msg_display(MSG_openfail, "script file",
+ strerror(errno));
}
}
return(0);
@@ -366,7 +368,7 @@ show_cmd(const char *scmd, struct winsiz
*/
static int
launch_subwin(WINDOW **actionwin, char **args, struct winsize *win, int flags,
- const char *scmd, const char **errstr)
+ const char *scmd, const char **errstr)
{
int n, i;
int selectfailed;
@@ -376,12 +378,10 @@ launch_subwin(WINDOW **actionwin, char *
char ibuf[MAXBUF];
char pktdata;
char *cp, *ncp;
- struct termios rtt;
- struct termios tt;
+ struct termios rtt, tt;
struct timeval tmo;
static int do_tioccons = 2;
-
(void)tcgetattr(STDIN_FILENO, &tt);
if (openpty(&master, &slave, NULL, &tt, win) == -1) {
*errstr = "openpty() failed";
@@ -483,7 +483,8 @@ launch_subwin(WINDOW **actionwin, char *
for (selectfailed = 0;;) {
if (selectfailed) {
- const char mmsg[] = "select(2) failed but no child died?";
+ const char mmsg[] =
+ "select(2) failed but no child died?";
if (logfp)
(void)fprintf(logfp, mmsg);
errx(1, mmsg);
