if (!(ctx->flags & E2F_FLAG_PROG_BAR))
return;
- printf("%s\r", spaces + (sizeof(spaces) - 80));
+ printf("\001%s\r\002", spaces + (sizeof(spaces) - 80));
+ fflush(stdout);
ctx->flags &= ~E2F_FLAG_PROG_BAR;
}
dpywidth -= 8;
i = ((percent * dpywidth) + 50) / 100;
- printf("%s: |%s%s", label, bar + (sizeof(bar) - (i+1)),
+ printf("\001%s: |%s%s", label, bar + (sizeof(bar) - (i+1)),
spaces + (sizeof(spaces) - (dpywidth - i + 1)));
if (percent == 100.0)
fputc('|', stdout);
else
fputc(spinner[ctx->progress_pos & 3], stdout);
if (dpynum)
- printf(" %4.1f%% %u\r", percent, dpynum);
+ printf(" %4.1f%% %u\r\002", percent, dpynum);
else
- printf(" %4.1f%% \r", percent);
+ printf(" %4.1f%% \r\002", percent);
if (percent == 100.0)
e2fsck_clear_progbar(ctx);
.SH SYNOPSIS
.B logsave
[
-.B \-v
+.B \-asv
]
-.I logfile command [ ... ]
+.I logfile cmd_prog [ ... ]
.SH DESCRIPTION
The
.B logsave
program will execute
-.I command
-with the specified argument, and save a copy of its output to
+.I cmd_prog
+with the specified argument(s), and save a copy of its output to
.IR logfile .
If the containing directory for
.I logfile
A copy of the output will also be written to standard output.
.PP
If
-.I command
+.I cmd_prog
is a single hyphen ('-'), then instead of executing a program,
.B logsave
-will take the input from standard input.
+will take its input from standard input and save it in
+.I logfile
.PP
.B logsave
is useful for saving the output of initial boot scripts
.B \-a
This option will cause the output to be appended to
.IR logfile ,
-instead of replacing the current contents.
+instead of replacing its current contents.
+.TP
+.B \-s
+This option will cause
+.B logsave
+to skip writing to the log file text which is bracketed with a control-A
+(ASCII 001 or Start of Header) and control-B (ASCII 002 or Start of
+Text). This allows progress bar information to be visible to the user
+on the console, while not being written to the log file.
.TP
.B \-v
-This option will
+This option will make
.B logsave
-more verbose.
+to be more verbose in its output to the user.
.SH AUTHOR
Theodore Ts'o (tytso@mit.edu)
.SH SEE ALSO
int outbufsize = 0;
void *outbuf = 0;
int verbose = 0;
+int do_skip = 0;
+int skip_mode = 0;
static void usage(char *progname)
{
exit(1);
}
-static void process_output(const char *buffer, int c)
+#define SEND_LOG 0x01
+#define SEND_CONSOLE 0x02
+#define SEND_BOTH 0x03
+
+static void send_output(const char *buffer, int c, int flag)
{
char *n;
if (c == 0)
c = strlen(buffer);
- write(1, buffer, c);
+ if (flag & SEND_CONSOLE)
+ write(1, buffer, c);
+ if (!(flag & SEND_LOG))
+ return;
if (outfd > 0)
write(outfd, buffer, c);
else {
}
}
-static void do_read(int fd)
+static int do_read(int fd)
{
int c;
- char buffer[4096];
+ char buffer[4096], *cp, *sep;
- c = read(fd, buffer, sizeof(buffer));
- process_output(buffer, c);
+ c = read(fd, buffer, sizeof(buffer)-1);
+ if (c <= 0)
+ return c;
+ if (do_skip) {
+ send_output(buffer, c, SEND_CONSOLE);
+ buffer[c] = 0;
+ cp = buffer;
+ while (*cp) {
+ if (skip_mode) {
+ cp = strchr(cp, '\002');
+ if (!cp)
+ return 0;
+ cp++;
+ skip_mode = 0;
+ continue;
+ }
+ sep = strchr(cp, '\001');
+ if (sep)
+ *sep = 0;
+ send_output(cp, 0, SEND_LOG);
+ if (sep) {
+ cp = sep + 1;
+ skip_mode = 1;
+ } else
+ break;
+ }
+ } else
+ send_output(buffer, c, SEND_BOTH);
+ return c;
}
static int run_program(char **argv)
{
int fds[2];
- char **cpp;
int status, rc, pid;
char buffer[80];
- time_t t;
if (pipe(fds) < 0) {
perror("pipe");
exit(1);
}
- if (verbose) {
- process_output("Log of ", 0);
- for (cpp = argv; *cpp; cpp++) {
- process_output(*cpp, 0);
- process_output(" ", 0);
- }
- process_output("\n", 0);
- t = time(0);
- process_output(ctime(&t), 0);
- process_output("\n", 0);
- }
-
pid = fork();
if (pid < 0) {
perror("vfork");
if ( WIFEXITED(status) ) {
rc = WEXITSTATUS(status);
if (rc) {
- process_output(argv[0], 0);
+ send_output(argv[0], 0, SEND_BOTH);
sprintf(buffer, " died with exit status %d", rc);
- process_output(buffer, 0);
+ send_output(buffer, 0, SEND_BOTH);
}
} else {
if (WIFSIGNALED(status)) {
- process_output(argv[0], 0);
+ send_output(argv[0], 0, SEND_BOTH);
sprintf(buffer, "died with signal %d",
WTERMSIG(status));
- process_output(buffer, 0);
+ send_output(buffer, 0, SEND_BOTH);
rc = 1;
}
rc = 0;
static int copy_from_stdin(void)
{
- char buffer[4096];
- int c;
- int bad_read = 0;
+ int c, bad_read = 0;
while (1) {
- c = read(0, buffer, sizeof(buffer));
+ c = do_read(0);
if ((c == 0 ) ||
((c < 0) && ((errno == EAGAIN) || (errno == EINTR)))) {
if (bad_read++ > 3)
perror("read");
exit(1);
}
- process_output(buffer, c);
bad_read = 0;
}
return 0;
int main(int argc, char **argv)
{
int c, pid, rc;
- char *outfn;
+ char *outfn, **cpp;
int openflags = O_CREAT|O_WRONLY|O_TRUNC;
+ int send_flag = SEND_LOG;
+ int do_stdin;
+ time_t t;
- while ((c = getopt(argc, argv, "+v")) != EOF) {
+ while ((c = getopt(argc, argv, "+asv")) != EOF) {
switch (c) {
case 'a':
openflags &= ~O_TRUNC;
openflags |= O_APPEND;
break;
+ case 's':
+ do_skip = 1;
+ break;
case 'v':
verbose++;
+ send_flag |= SEND_CONSOLE;
break;
}
}
argv += optind;
argc -= optind;
- outfd = open(outfn, O_CREAT|O_WRONLY|O_TRUNC, 0644);
+ outfd = open(outfn, openflags, 0644);
+ do_stdin = !strcmp(argv[0], "-");
+
+ send_output("Log of ", 0, send_flag);
+ if (do_stdin)
+ send_output("stdin", 0, send_flag);
+ else {
+ for (cpp = argv; *cpp; cpp++) {
+ send_output(*cpp, 0, send_flag);
+ send_output(" ", 0, send_flag);
+ }
+ }
+ send_output("\n", 0, send_flag);
+ t = time(0);
+ send_output(ctime(&t), 0, send_flag);
+ send_output("\n", 0, send_flag);
- if (strcmp(argv[0], "-"))
- rc = run_program(argv);
- else
+ if (do_stdin)
rc = copy_from_stdin();
+ else
+ rc = run_program(argv);
+ send_output("\n", 0, send_flag);
+ t = time(0);
+ send_output(ctime(&t), 0, send_flag);
+ send_output("----------------\n", 0, send_flag);
+
if (outbuf) {
pid = fork();
if (pid < 0) {
exit(rc);
}
while (outfd < 0) {
- outfd = open(outfn, O_CREAT|O_WRONLY|O_TRUNC, 0644);
+ outfd = open(outfn, openflags, 0644);
sleep(1);
}
write(outfd, outbuf, outbufsize);
git://git.whamcloud.com / tools / e2fsprogs.git / commitdiff