Changed default runlevels from 3,5 to 2,3,4,5

Changed function names to a more descriptive and consistent set.

exit status on SIGQUIT in debug mode now 0 (normal exit).


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@902 4ea69e1a-61f1-4043-bf83-b5c94c648137

sm5/CHANGELOG

 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.179 2003/08/18 07:10:41 ballen4705 Exp $
+$Id: CHANGELOG,v 1.180 2003/08/19 09:14:32 ballen4705 Exp $
 
 Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 
@@ -38,6 +38,9 @@ CURRENT DEVELOPMENT VERSION (see VERSION file in this directory):
  
   <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED HERE, PLEASE>
 
+  [BA] Default runlevels for smartd changed from 3 and 5 to
+       2, 3, 4, and 5.
+
   [BA] Removed as much dynamic memory allocation as possible from
        configuration file parsing. Reloading config file, even in
        presence of syntax errors etc. should not cause memory leaks.

sm5/smartd.8

 \# Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 \# 
-\# $Id: smartd.8,v 1.110 2003/08/16 06:23:27 ballen4705 Exp $
+\# $Id: smartd.8,v 1.111 2003/08/19 09:14:32 ballen4705 Exp $
 \#
 \# This program is free software; you can redistribute it and/or modify it
 \# under the terms of the GNU General Public License as published by the Free
@@ -16,7 +16,7 @@
 \# Research Center), Jack Baskin School of Engineering, University of
 \# California, Santa Cruz. http://ssrc.soe.ucsc.edu/
 \#
-.TH SMARTD 8  "$Date: 2003/08/16 06:23:27 $" "smartmontools-5.1"
+.TH SMARTD 8  "$Date: 2003/08/19 09:14:32 $" "smartmontools-5.1"
 .SH NAME
 smartd \- SMART Disk Monitoring Daemon
 .SH SYNOPSIS
@@ -1229,7 +1229,7 @@ The return value (exit status) of
 can have the following values:
 .TP
 .B 0:
-Daemon startup successful, or \fBsmartd\fP was killed by a SIGTERM.
+Daemon startup successful, or \fBsmartd\fP was killed by a SIGTERM (or in debug mode, a SIGQUIT).
 .TP
 .B 1:
 Commandline did not parse.
@@ -1268,8 +1268,12 @@ can't be monitored.
 didn't find any devices to monitor.
 .TP
 .B 254:
+When in daemon mode,
 .B smartd
-received a SIGINT or SIGQUIT.
+received a SIGINT or SIGQUIT.  (Note that in debug mode, SIGINT has
+the same effect as SIGHUP, and makes \fBsmartd\fP reload its
+configuration file. SIGQUIT has the same effect as SIGTERM and causes
+\fBsmartd\fP to exit with zero exit status.
 .TP
 .B 132 and above
 .B smartd
@@ -1336,4 +1340,4 @@ smartmontools home page at \fBhttp://smartmontools.sourceforge.net/\fP .
 
 .SH
 CVS ID OF THIS PAGE:
-$Id: smartd.8,v 1.110 2003/08/16 06:23:27 ballen4705 Exp $
+$Id: smartd.8,v 1.111 2003/08/19 09:14:32 ballen4705 Exp $

sm5/smartd.h

@@ -23,7 +23,7 @@
  */
 
 #ifndef SMARTD_H_CVSID
-#define SMARTD_H_CVSID "$Id: smartd.h,v 1.44 2003/08/18 12:39:18 dpgilbert Exp $\n"
+#define SMARTD_H_CVSID "$Id: smartd.h,v 1.45 2003/08/19 09:14:33 ballen4705 Exp $\n"
 #endif
 
 // Configuration file
@@ -222,12 +222,11 @@ typedef struct changedattribute_s {
   unsigned char sameraw;
 } changedattribute_t;
 
-// Declare our own printing functions...
-void printout(int priority,char *fmt, ...) __attribute__ ((format(printf, 2, 3)));
-void printandmail(cfgfile *cfg, int which, int priority, char *fmt, ...) __attribute__ ((format(printf, 4, 5)));   
-
-int ataCheckDevice(cfgfile *cfg);
+// Declare our own printing functions. Doing this provides error
+// messages if the argument number/types don't match the format.
+void PrintOut(int priority,char *fmt, ...) __attribute__ ((format(printf, 2, 3)));
 
+void PrintAndMail(cfgfile *cfg, int which, int priority, char *fmt, ...) __attribute__ ((format(printf, 4, 5)));   
 
 /* Debugging notes: to check for memory allocation/deallocation problems, use:
 

sm5/smartd.initd

 #!/bin/bash
-# chkconfig: 35 40 40
+# chkconfig: 2345 40 40
 # smartmontools init file for smartd
 #
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 #
 # processname: smartd 
 #
-# $Id: smartd.initd,v 1.6 2003/05/09 19:20:23 ballen4705 Exp $
+# $Id: smartd.initd,v 1.7 2003/08/19 09:14:33 ballen4705 Exp $
 #
 # Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 #