[netfilter-cvslog] r4418 - trunk/conntrack/src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2005-11-01 21:14:13 +0100 (Tue, 01 Nov 2005)
New Revision: 4418

Modified:
   trunk/conntrack/src/conntrack.c
Log:
o Fix --id parameter parsing



Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-11-01 00:49:30 UTC (rev 4417)
+++ trunk/conntrack/src/conntrack.c	2005-11-01 20:14:13 UTC (rev 4418)
@@ -860,11 +860,19 @@
 		case 'm':
 			mark = atol(optarg);
 			break;
-		case 'i':
+		case 'i': {
+			char *s = NULL;
 			options |= CT_OPT_ID;
 			if (optarg)
-				id = atol(optarg);
+				break;
+			else if (optind < argc && argv[optind][0] != '-'
+					&& argv[optind][0] != '!')
+				s = argv[optind++];
+
+			if (s)
+				id = atol(s);
 			break;
+		}
 		default:
 			if (h && h->parse_opts 
 			    &&!h->parse_opts(c - h->option_offset, argv, &orig,