Perform a major cleanup of the usr.sbin Makefiles.

[pw-darwin.git] / pw / pw.h

diff --git a/pw/pw.h b/pw/pw.h
index 4383a11775e42f062bc5c4a7fa949c411bf5c7c3..f541b26e1743c56719e79f31e5f5d5e348bb924f 100644 (file)
--- a/pw/pw.h
+++ b/pw/pw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     $Id$
+ * $FreeBSD$

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -34,12 +34,14 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <sys/param.h>

 #include <pwd.h>
 #include <grp.h>
 #include <sys/queue.h>
 #include <sysexits.h>
 
 #include "psdate.h"
 #include <pwd.h>
 #include <grp.h>
 #include <sys/queue.h>
 #include <sysexits.h>
 
 #include "psdate.h"

+#include "pwupd.h"

 
 enum _mode
 {
 
 enum _mode
 {


@@ -48,6 +50,8 @@ enum _mode
         M_UPDATE,
         M_PRINT,
        M_NEXT,
         M_UPDATE,
         M_PRINT,
        M_NEXT,

+       M_LOCK,
+       M_UNLOCK,

         M_NUM
 };
 
         M_NUM
 };
 


@@ -98,7 +102,6 @@ struct userconf *read_userconfig(char const * file);
 int write_userconfig(char const * file);
 struct carg *addarg(struct cargs * _args, int ch, char *argstr);
 struct carg *getarg(struct cargs * _args, int ch);
 int write_userconfig(char const * file);
 struct carg *addarg(struct cargs * _args, int ch, char *argstr);
 struct carg *getarg(struct cargs * _args, int ch);

-void cmderr(int ec, char const * fmt,...);

 
 int pw_user(struct userconf * cnf, int mode, struct cargs * _args);
 int pw_group(struct userconf * cnf, int mode, struct cargs * _args);
 
 int pw_user(struct userconf * cnf, int mode, struct cargs * _args);
 int pw_group(struct userconf * cnf, int mode, struct cargs * _args);


@@ -121,7 +124,7 @@ int boolean_val(char const * str, int dflt);
 char const *boolean_str(int val);
 char *newstr(char const * p);
 
 char const *boolean_str(int val);
 char *newstr(char const * p);
 

-void pw_log(struct userconf * cnf, int mode, int which, char const * fmt,...);
+void pw_log(struct userconf * cnf, int mode, int which, char const * fmt,...) __printflike(4, 5);

 char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];
 char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];