d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out suppress '\n' mod.

Browse Source
This commit is contained in:
Daniel O'Callaghan 1997-10-03 12:54:30 +00:00
parent 536a384920
commit c5c1c13516
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/date/date.1
View File

@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
.\" $Id: date.1,v 1.18 1997/09/13 16:01:27 wosch Exp $
.\" $Id: date.1,v 1.8.2.4 1997/09/14 13:07:03 jkh Exp $
.\"
.Dd November 17, 1993
.Dt DATE 1
@ -46,7 +46,7 @@
.Op Fl d Ar dst
.Op Fl r Ar seconds
.Op Fl t Ar minutes_west
.Op Fl nsu
.Op Fl nu
.Op Cm + Ns Ar format
.Op Fl v Ar [+|-]val[ymwdHM]
.Ar ...
@ -95,9 +95,6 @@ from setting the time for other than the current machine.
Print out the date and time in
.Ar seconds
from the Epoch.
.It Fl s
Single-line print - don't print final linefeed character, useful for
adding dated lines to logfiles generated by shell scripts.
.It Fl t
Set the kernel's value for minutes west of
.Tn GMT .

17
bin/date/date.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: date.c,v 1.19 1997/10/01 05:24:08 danny Exp $
* $Id: date.c,v 1.7.2.5 1997/10/01 06:12:58 danny Exp $
*/
#ifndef lint
@ -76,7 +76,7 @@ main(argc, argv)
extern int optind;
extern char *optarg;
struct timezone tz;
int ch, rflag, sflag;
int ch, rflag;
char *format, buf[1024];
char *endptr, *fmt;
int set_timezone;
@ -88,9 +88,9 @@ main(argc, argv)
fmt = NULL;
(void) setlocale(LC_TIME, "");
tz.tz_dsttime = tz.tz_minuteswest = 0;
rflag = sflag = 0;
rflag = 0;
set_timezone = 0;
while ((ch = getopt(argc, argv, "d:f:nr:st:uv:")) != -1)
while ((ch = getopt(argc, argv, "d:f:nr:t:uv:")) != -1)
switch((char)ch) {
case 'd': /* daylight savings time */
tz.tz_dsttime = strtol(optarg, &endptr, 10) ? 1 : 0;
@ -108,9 +108,6 @@ main(argc, argv)
rflag = 1;
tval = atol(optarg);
break;
case 's':
sflag = 1;
break;
case 't': /* minutes west of GMT */
/* error check; don't allow "PST" */
tz.tz_minuteswest = strtol(optarg, &endptr, 10);
@ -167,9 +164,7 @@ main(argc, argv)
}
vary_destroy(v);
(void)strftime(buf, sizeof(buf), format, &lt);
(void)printf("%s", buf);
if (!sflag)
(void)printf("\n");
(void)printf("%s\n", buf);
exit(retval);
}
@ -281,7 +276,7 @@ static void
usage()
{
(void)fprintf(stderr, "%s\n%s\n",
"usage: date [-nsu] [-d dst] [-r seconds] [-t west] [+format]",
"usage: date [-nu] [-d dst] [-r seconds] [-t west] [+format]",
" [-v [+|-]val[ymwdHM]] ... [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]]");
exit(1);
}