From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 4 Aug 2011 19:39:31 +0000 (-0400)
Subject: [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with... 
X-Git-Tag: NTP_4_2_7P201~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4a0d82a8474d0e9adc4b365a5b3b557be7b2e3c;p=thirdparty%2Fntp.git

[Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd

bk: 4e3af573vLqd4kBAIKcKkiUVHJjs7A
---

diff --git a/ChangeLog b/ChangeLog
index fd6395c3d..b8020c6f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
 
+* [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be
+  consistent with ntpd.
 * libopts/file.c fix from Bruce Korb (arg-type=file).
 
 ---
diff --git a/sntp/main.c b/sntp/main.c
index b96a0cab8..9ddb5bfa8 100644
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -57,8 +57,8 @@ sntp_main (
 
 	/* Initialize logging system */
 	init_logging();
-	if (HAVE_OPT(FILELOG))
-		open_logfile(OPT_ARG(FILELOG));
+	if (HAVE_OPT(LOGFILE))
+		open_logfile(OPT_ARG(LOGFILE));
 
 	msyslog(LOG_NOTICE, "Started sntp");
 
diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 78f143bf9..4a625413c 100644
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -6,20 +6,15 @@ autogen definitions options;
 #include copyright.def
 
 prog-name      = "sntp";
-prog-title     = "standard SNTP program";
-homerc         =  $HOME, ".";
-argument       = 'hostname-or-IP ...';
+prog-title	= "standard Simple Network Time Protocol program";
+argument	= '[ hostname-or-IP ...]';
+
+#include homerc.def
 
 long-opts;
 
 config-header  = "config.h";
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
 environrc;
 
 #include version.def
@@ -32,7 +27,7 @@ flag = {
     flags-cant = ipv6;
     descrip   = "Force IPv4 DNS name resolution";
     doc = <<-  _EndOfDoc_
-	Force DNS resolution of following host names on the command line
+	Force DNS resolution of the following host names on the command line
 	to the IPv4 namespace.
 	_EndOfDoc_;
 };
@@ -43,7 +38,7 @@ flag = {
     flags-cant = ipv4;
     descrip   = "Force IPv6 DNS name resolution";
     doc = <<-  _EndOfDoc_
-	Force DNS resolution of following host names on the command line
+	Force DNS resolution of the following host names on the command line
 	to the IPv6 namespace.
 	_EndOfDoc_;
 };
@@ -68,7 +63,7 @@ flag = {
     arg-name  = "file-name";
     descrip   = "KoD history filename";
     doc = <<-  _EndOfDoc_
-	Modifies the filename to be used to persist the history of KoD
+	Specifies the filename to be used to persist the history of KoD
 	responses received from servers.  The default is
 	/var/db/ntp-kod.
 	_EndOfDoc_;
@@ -78,7 +73,7 @@ flag = {
 flag = {
 	name	= syslog;
 	value	= p;
-	flags-cant = filelog;
+	flags-cant = logfile;
 	descrip = "Logging with syslog";
 	doc = <<-  _EndOfDoc_
 	When this option is set all logging will be done using syslog.
@@ -86,7 +81,7 @@ flag = {
 };
 
 flag = {
-	name	   = filelog;
+	name	   = logfile;
 	value	   = l;
 	arg-type   = string;
 	arg-name   = "file-name";