svn commit: r290226 - head/usr.sbin/newsyslog

[Baptiste Daroussin]

Author: bapt
Date: Sat Oct 31 09:45:11 2015
New Revision: 290226
URL: https://svnweb.freebsd.org/changeset/base/290226

Log:
  newsyslog: treat 'c' flag in the config as 'C'
  
  When -C was introduced in r114137 the plan was to have -C and -c being used for
  "create" due to a typo in FreeBSD <= 4.8 a temporary compatibility hack has been
  added to make -c being like -G aka GLOB and a warning was issued for the user to
  be aware of the futur change for -c.
  
  12 years later it is more than time to remove that hack and finish the what was
  intent in r114137
  
  Submitted by:	Alexandre Perrin <alex at kaworu.ch>
  Relnotes:	yes
  Differential Revision:	https://reviews.freebsd.org/D4000

Modified:
  head/usr.sbin/newsyslog/newsyslog.c

Modified: head/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- head/usr.sbin/newsyslog/newsyslog.c	Sat Oct 31 09:32:39 2015	(r290225)
+++ head/usr.sbin/newsyslog/newsyslog.c	Sat Oct 31 09:45:11 2015	(r290226)
@@ -1271,20 +1271,6 @@ no_trimat:
 				working->flags |= CE_BINARY;
 				break;
 			case 'c':
-				/*
-				 * XXX - 	Ick! Ugly! Remove ASAP!
-				 * We want `c' and `C' for "create".  But we
-				 * will temporarily treat `c' as `g', because
-				 * FreeBSD releases <= 4.8 have a typo of
-				 * checking  ('G' || 'c')  for CE_GLOB.
-				 */
-				if (*q == 'c') {
-					warnx("Assuming 'g' for 'c' in flags for line:\n%s",
-					    errline);
-					warnx("The 'c' flag will eventually mean 'CREATE'");
-					working->flags |= CE_GLOB;
-					break;
-				}
 				working->flags |= CE_CREATE;
 				break;
 			case 'd':