e2image: clean up progress reporting

[tools/e2fsprogs.git] / misc / logsave.c

diff --git a/misc/logsave.c b/misc/logsave.c
index f256c20..8612edf 100644 (file)
--- a/misc/logsave.c
+++ b/misc/logsave.c
@@ -10,6 +10,9 @@
  * %End-Header%
  */
 
+#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */
+
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -19,6 +22,9 @@
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -26,16 +32,17 @@ extern char *optarg;
 extern int optind;
 #endif
 
-int    outfd = -1;
-int    outbufsize = 0;
-void   *outbuf = 0;
-int    verbose = 0;
-int    do_skip = 0;
-int    skip_mode = 0;
+static int     outfd = -1;
+static int     outbufsize = 0;
+static void    *outbuf = 0;
+static int     verbose = 0;
+static int     do_skip = 0;
+static int     skip_mode = 0;
+static pid_t   child_pid = -1;
 
 static void usage(char *progname)
 {
-       printf("Usage: %s [-v] [-d dir] logfile program\n", progname);
+       printf("Usage: %s [-asv] logfile program\n", progname);
        exit(1);
 }
 
@@ -43,19 +50,61 @@ static void usage(char *progname)
 #define SEND_CONSOLE   0x02
 #define SEND_BOTH      0x03
 
+/*
+ * Helper function that does the right thing if write returns a
+ * partial write, or an EGAIN/EINTR error.
+ */
+static int write_all(int fd, const char *buf, size_t count)
+{
+       ssize_t ret;
+       int c = 0;
+
+       while (count > 0) {
+               ret = write(fd, buf, count);
+               if (ret < 0) {
+                       if ((errno == EAGAIN) || (errno == EINTR))
+                               continue;
+                       return -1;
+               }
+               count -= ret;
+               buf += ret;
+               c += ret;
+       }
+       return c;
+}
+
 static void send_output(const char *buffer, int c, int flag)
 {
-       char    *n;
-       
+       const char      *cp;
+       char            *n;
+       int             cnt, d, del;
+
        if (c == 0)
                c = strlen(buffer);
-       
-       if (flag & SEND_CONSOLE)
-               write(1, buffer, c);
+
+       if (flag & SEND_CONSOLE) {
+               cnt = c;
+               cp = buffer;
+               while (cnt) {
+                       del = 0;
+                       for (d=0; d < cnt; d++) {
+                               if (skip_mode &&
+                                   (cp[d] == '\001' || cp[d] == '\002')) {
+                                       del = 1;
+                                       break;
+                               }
+                       }
+                       write_all(1, cp, d);
+                       if (del)
+                               d++;
+                       cnt -= d;
+                       cp += d;
+               }
+       }
        if (!(flag & SEND_LOG))
                return;
        if (outfd > 0)
-               write(outfd, buffer, c);
+               write_all(outfd, buffer, c);
        else {
                n = realloc(outbuf, outbufsize + c);
                if (n) {
@@ -102,17 +151,36 @@ static int do_read(int fd)
        return c;
 }
 
+static void signal_term(int sig)
+{
+       if (child_pid > 0)
+               kill(child_pid, sig);
+}
+
 static int run_program(char **argv)
 {
        int     fds[2];
        int     status, rc, pid;
        char    buffer[80];
+#ifdef HAVE_SIGNAL_H
+       struct sigaction        sa;
+#endif
 
        if (pipe(fds) < 0) {
                perror("pipe");
                exit(1);
        }
 
+#ifdef HAVE_SIGNAL_H
+       memset(&sa, 0, sizeof(struct sigaction));
+       sa.sa_handler = signal_term;
+       sigaction(SIGINT, &sa, 0);
+       sigaction(SIGTERM, &sa, 0);
+#ifdef SA_RESTART
+       sa.sa_flags = SA_RESTART;
+#endif
+#endif
+
        pid = fork();
        if (pid < 0) {
                perror("vfork");
@@ -122,16 +190,19 @@ static int run_program(char **argv)
                dup2(fds[1],1);         /* fds[1] replaces stdout */
                dup2(fds[1],2);         /* fds[1] replaces stderr */
                close(fds[0]);  /* don't need this here */
-               
+               close(fds[1]);
+
                execvp(argv[0], argv);
                perror(argv[0]);
                exit(1);
        }
+       child_pid = pid;
        close(fds[1]);
 
        while (!(waitpid(pid, &status, WNOHANG ))) {
                do_read(fds[0]);
        }
+       child_pid = -1;
        do_read(fds[0]);
        close(fds[0]);
 
@@ -174,8 +245,8 @@ static int copy_from_stdin(void)
                bad_read = 0;
        }
        return 0;
-}      
-       
+}
+
 
 
 int main(int argc, char **argv)
@@ -186,7 +257,7 @@ int main(int argc, char **argv)
        int     send_flag = SEND_LOG;
        int     do_stdin;
        time_t  t;
-       
+
        while ((c = getopt(argc, argv, "+asv")) != EOF) {
                switch (c) {
                case 'a':
@@ -211,7 +282,7 @@ int main(int argc, char **argv)
 
        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);
@@ -230,7 +301,7 @@ int main(int argc, char **argv)
                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);
@@ -252,11 +323,12 @@ int main(int argc, char **argv)
                while (outfd < 0) {
                        outfd = open(outfn, openflags, 0644);
                        sleep(1);
-               } 
-               write(outfd, outbuf, outbufsize);
+               }
+               write_all(outfd, outbuf, outbufsize);
                free(outbuf);
        }
-       close(outfd);
-       
+       if (outfd >= 0)
+               close(outfd);
+
        exit(rc);
 }