From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 25 Jul 2008 15:42:34 +0000 (+0000)
Subject: 2008-07-24  Dmitry V. Levin <ldv@altlinux.org>
X-Git-Tag: v4.5.18~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06350dba7505eda4b8220cca8a9b112504fafc4d;p=strace

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

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

diff --git a/ChangeLog b/ChangeLog
index 1205c823..1747df3a 100644
--- 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 0cbe3228..8a77bb14 100644
--- 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",