[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1383690600-24170-1-git-send-email-mforney@mforney.org>
Date: Tue, 5 Nov 2013 14:30:00 -0800
From: Michael Forney <mforney@...rney.org>
To: musl@...ts.openwall.com
Subject: [PATCH v2] shadow: Implement putspent
---
Thanks Rich,
I didn't know about negative and zero precision specifiers. This turned out
much cleaner.
I've also changed the fields to use %ld because they are longs, and changed the
last field to %lu because it is unsigned (though unused).
src/passwd/fgetspent.c | 5 -----
src/passwd/putspent.c | 13 +++++++++++++
2 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 src/passwd/putspent.c
diff --git a/src/passwd/fgetspent.c b/src/passwd/fgetspent.c
index a9a3c97..3dda784 100644
--- a/src/passwd/fgetspent.c
+++ b/src/passwd/fgetspent.c
@@ -4,8 +4,3 @@ struct spwd *fgetspent(FILE *f)
{
return 0;
}
-
-int putspent(const struct spwd *sp, FILE *f)
-{
- return -1;
-}
diff --git a/src/passwd/putspent.c b/src/passwd/putspent.c
new file mode 100644
index 0000000..fbf4278
--- /dev/null
+++ b/src/passwd/putspent.c
@@ -0,0 +1,13 @@
+#include <shadow.h>
+#include <stdio.h>
+
+#define NUM(n) (n == -1 ? 0 : -1), (n == -1 ? 0 : n)
+#define STR(s) (s ? s : "")
+
+int putspent(const struct spwd *sp, FILE *f)
+{
+ return fprintf(f, "%s:%s:%.*ld:%.*ld:%.*ld:%.*ld:%.*ld:%.*ld:%.*lu\n",
+ STR(sp->sp_namp), STR(sp->sp_pwdp), NUM(sp->sp_lstchg),
+ NUM(sp->sp_min), NUM(sp->sp_max), NUM(sp->sp_warn),
+ NUM(sp->sp_inact), NUM(sp->sp_expire), NUM(sp->sp_flag)) < 0 ? -1 : 0;
+}
--
1.8.4.2
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
