Re: ancient relics in newsyslog

[Todd C. Miller]

On Wed, 01 Jun 2016 01:43:06 -0400, "Ted Unangst" wrote:

> Let's make the defaults be the defaults.

OK millert@

 - todd

Re: ancient relics in newsyslog

[Martin Natano]

On Wed, Jun 01, 2016 at 01:43:06AM -0400, Ted Unangst wrote:
> Let's make the defaults be the defaults.

Reads fine. ok natano@


> 
> Index: Makefile
> ===
> RCS file: /cvs/src/usr.bin/newsyslog/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile  30 Mar 2016 06:38:46 -  1.6
> +++ Makefile  1 Jun 2016 05:42:06 -
> @@ -2,14 +2,6 @@
>  
>  PROG=newsyslog
>  
> -CFLAGS+= -DCONF=\"/etc/newsyslog.conf\"
> -CFLAGS+= -DPIDFILE=\"/var/run/syslog.pid\"
> -CFLAGS+= -DCOMPRESS=\"/usr/bin/gzip\"
> -CFLAGS+= -DCOMPRESS_POSTFIX=\".gz\"
> -CFLAGS+= -DSTATS_DIR=\"/var/run\"
> -CFLAGS+= -DSENDMAIL=\"/usr/sbin/sendmail\"
> -CFLAGS+= -DQUAD_OFF_T
> -
>  BINOWN=  root
>  
>  MAN= newsyslog.8
> Index: newsyslog.c
> ===
> RCS file: /cvs/src/usr.bin/newsyslog/newsyslog.c,v
> retrieving revision 1.100
> diff -u -p -r1.100 newsyslog.c
> --- newsyslog.c   11 Jan 2016 19:26:04 -  1.100
> +++ newsyslog.c   1 Jun 2016 05:41:59 -
> @@ -71,24 +71,12 @@
>   *
>   */
>  
> -#ifndef CONF
> -#define CONF "/etc/newsyslog.conf" /* Configuration file */
> -#endif
> -#ifndef PIDFILE
> -#define PIDFILE "/etc/syslog.pid"
> -#endif
> -#ifndef COMPRESS
> -#define COMPRESS "/usr/bin/compress" /* File compression program */
> -#endif
> -#ifndef COMPRESS_POSTFIX
> -#define COMPRESS_POSTFIX ".Z"
> -#endif
> -#ifndef STATS_DIR
> -#define STATS_DIR "/etc"
> -#endif
> -#ifndef SENDMAIL
> -#define SENDMAIL "/usr/lib/sendmail"
> -#endif
> +#define CONF "/etc/newsyslog.conf"
> +#define PIDFILE "/var/run/syslog.pid"
> +#define COMPRESS "/usr/bin/gzip"
> +#define COMPRESS_POSTFIX ".gz"
> +#define STATS_DIR "/var/run"
> +#define SENDMAIL "/usr/sbin/sendmail"
>  
>  #include/* DEV_BSIZE */
>  #include 
> @@ -1002,11 +990,7 @@ domonitor(struct conf_entry *ent)
>   warn("%s", fname);
>   goto cleanup;
>   }
> -#ifdef QUAD_OFF_T
>   if (fscanf(fp, "%lld\n", ) != 1) {
> -#else
> - if (fscanf(fp, "%ld\n", ) != 1) {
> -#endif   /* QUAD_OFF_T */
>   fclose(fp);
>   goto update;
>   }
> @@ -1060,11 +1044,7 @@ update:
>   warn("%s", fname);
>   goto cleanup;
>   }
> -#ifdef QUAD_OFF_T
>   fprintf(fp, "%lld\n", (long long)sb.st_size);
> -#else
> - fprintf(fp, "%ld\n", (long)sb.st_size);
> -#endif   /* QUAD_OFF_T */
>   fclose(fp);
>  
>  cleanup:
> 

ancient relics in newsyslog

[Ted Unangst]

Let's make the defaults be the defaults.

Index: Makefile
===
RCS file: /cvs/src/usr.bin/newsyslog/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile30 Mar 2016 06:38:46 -  1.6
+++ Makefile1 Jun 2016 05:42:06 -
@@ -2,14 +2,6 @@
 
 PROG=  newsyslog
 
-CFLAGS+= -DCONF=\"/etc/newsyslog.conf\"
-CFLAGS+= -DPIDFILE=\"/var/run/syslog.pid\"
-CFLAGS+= -DCOMPRESS=\"/usr/bin/gzip\"
-CFLAGS+= -DCOMPRESS_POSTFIX=\".gz\"
-CFLAGS+= -DSTATS_DIR=\"/var/run\"
-CFLAGS+= -DSENDMAIL=\"/usr/sbin/sendmail\"
-CFLAGS+= -DQUAD_OFF_T
-
 BINOWN=root
 
 MAN=   newsyslog.8
Index: newsyslog.c
===
RCS file: /cvs/src/usr.bin/newsyslog/newsyslog.c,v
retrieving revision 1.100
diff -u -p -r1.100 newsyslog.c
--- newsyslog.c 11 Jan 2016 19:26:04 -  1.100
+++ newsyslog.c 1 Jun 2016 05:41:59 -
@@ -71,24 +71,12 @@
  *
  */
 
-#ifndef CONF
-#define CONF "/etc/newsyslog.conf" /* Configuration file */
-#endif
-#ifndef PIDFILE
-#define PIDFILE "/etc/syslog.pid"
-#endif
-#ifndef COMPRESS
-#define COMPRESS "/usr/bin/compress" /* File compression program */
-#endif
-#ifndef COMPRESS_POSTFIX
-#define COMPRESS_POSTFIX ".Z"
-#endif
-#ifndef STATS_DIR
-#define STATS_DIR "/etc"
-#endif
-#ifndef SENDMAIL
-#define SENDMAIL "/usr/lib/sendmail"
-#endif
+#define CONF "/etc/newsyslog.conf"
+#define PIDFILE "/var/run/syslog.pid"
+#define COMPRESS "/usr/bin/gzip"
+#define COMPRESS_POSTFIX ".gz"
+#define STATS_DIR "/var/run"
+#define SENDMAIL "/usr/sbin/sendmail"
 
 #include  /* DEV_BSIZE */
 #include 
@@ -1002,11 +990,7 @@ domonitor(struct conf_entry *ent)
warn("%s", fname);
goto cleanup;
}
-#ifdef QUAD_OFF_T
if (fscanf(fp, "%lld\n", ) != 1) {
-#else
-   if (fscanf(fp, "%ld\n", ) != 1) {
-#endif /* QUAD_OFF_T */
fclose(fp);
goto update;
}
@@ -1060,11 +1044,7 @@ update:
warn("%s", fname);
goto cleanup;
}
-#ifdef QUAD_OFF_T
fprintf(fp, "%lld\n", (long long)sb.st_size);
-#else
-   fprintf(fp, "%ld\n", (long)sb.st_size);
-#endif /* QUAD_OFF_T */
fclose(fp);
 
 cleanup: