diff options
| author | danny <danny@FreeBSD.org> | 1997-10-03 12:54:30 +0000 |
|---|---|---|
| committer | danny <danny@FreeBSD.org> | 1997-10-03 12:54:30 +0000 |
| commit | 724c03ee75ea729d17150be50fc842f79c37fd60 (patch) | |
| tree | 60ca3d387cbd7bb0d3644e036afde2d1f7f2af3b /bin/date/date.c | |
| parent | 15be8862e67c696a6f1810713399e2a40d8721fb (diff) | |
| download | FreeBSD-src-724c03ee75ea729d17150be50fc842f79c37fd60.zip FreeBSD-src-724c03ee75ea729d17150be50fc842f79c37fd60.tar.gz | |
Back out suppress '\n' mod.
Diffstat (limited to 'bin/date/date.c')
| -rw-r--r-- | bin/date/date.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/bin/date/date.c b/bin/date/date.c index 62a1341..31112cd 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -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, <); - (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); } |
