2008-07-24 Dmitry V. Levin <ldv@altlinux.org>

	* strace.c (main): Fix -F option backwards compatibility.

diff --git a/ChangeLog b/ChangeLog
index 1205c8232fcf261d967665d9ec8d220fcf031c90..1747df3a9e419e9472da6ef471a923a9c28b0f83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-24  Dmitry V. Levin <ldv@altlinux.org>
+
+       * strace.c (main): Fix -F option backwards compatibility.
+
 2008-07-22  Roland McGrath  <roland@redhat.com>
 
        * Makefile.am (EXTRA_DIST): Add new debian/ files.

diff --git a/strace.c b/strace.c
index 0cbe3228c9e40745898b66754b05936e35179387..8a77bb14ba73d8f1e0b075e270e3c7956db4a921 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -622,6 +622,7 @@ main(int argc, char *argv[])
        extern char *optarg;
        struct tcb *tcp;
        int c, pid = 0;
+       int optF = 0;
        struct sigaction sa;
 
        static char buf[BUFSIZ];
@@ -660,7 +661,8 @@ main(int argc, char *argv[])
                        debug++;
                        break;
                case 'F':
-                       /* Obsoleted, acts as `-f'.  */
+                       optF = 1;
+                       break;
                case 'f':
                        followfork++;
                        break;
@@ -757,6 +759,9 @@ main(int argc, char *argv[])
        if ((optind == argc) == !pflag_seen)
                usage(stderr, 1);
 
+       if (!followfork)
+               followfork = optF;
+
        if (followfork > 1 && cflag) {
                fprintf(stderr,
                        "%s: -c and -ff are mutually exclusive options\n",