aboutsummaryrefslogtreecommitdiff
path: root/contrib/amd/amd/amd.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-09-02 18:13:17 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-09-02 18:13:17 +0000
commit8cc613df483eb59e361170618990ee535d537bbc (patch)
treeb60a2f47493382fc52c4b26562233bb836d2f107 /contrib/amd/amd/amd.c
parent1cc9f0bb31fbad0b2ef2e7600a56cdb5c88927ef (diff)
downloadsrc-8cc613df483eb59e361170618990ee535d537bbc.tar.gz
src-8cc613df483eb59e361170618990ee535d537bbc.zip
Merge rev 1.7 (mount directory change) into Am-utils 6.0.7.
Notes
Notes: svn path=/head/; revision=82797
Diffstat (limited to 'contrib/amd/amd/amd.c')
-rw-r--r--contrib/amd/amd/amd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index a89d8d427cd9..1ad6d0a2f8b0 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2001 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: amd.c,v 1.6 1999/09/30 21:01:29 ezk Exp $
+ * $Id: amd.c,v 1.8.2.3 2001/01/10 03:22:59 ezk Exp $
* $FreeBSD$
*
*/
@@ -178,8 +178,8 @@ daemon_mode(void)
if (gopt.flags & CFM_PRINT_PID) {
if (STREQ(gopt.pid_file, "/dev/stdout")) {
printf("%ld\n", (long) am_mypid);
+ /* flush stdout, just in case */
fflush(stdout);
- /* do not fclose stdout */
} else {
FILE *f;
mode_t prev_umask = umask(0022); /* set secure temporary umask */
@@ -477,7 +477,7 @@ main(int argc, char *argv[])
verstr = strtok(get_version_string(), "\n");
plog(XLOG_INFO, "AM-UTILS VERSION INFORMATION:");
while (verstr) {
- plog(XLOG_INFO, verstr);
+ plog(XLOG_INFO, "%s", verstr);
verstr = strtok(NULL, "\n");
}