[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1383637660-7768-1-git-send-email-mforney@mforney.org>
Date: Mon, 4 Nov 2013 23:47:40 -0800
From: Michael Forney <mforney@...rney.org>
To: musl@...ts.openwall.com
Subject: [PATCH] shadow: Implement putspent
---
When I brought up implementing the shadow.h functions on IRC, several concerns
were raised. However, it turns out that the shadow package only requires
putspent. I didn't understand the concerns on IRC, so if there is an issue with
the implementation of this function, please let me know and hopefully I'll be
able to address it.
src/passwd/fgetspent.c | 5 -----
src/passwd/putspent.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 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..bb0a410
--- /dev/null
+++ b/src/passwd/putspent.c
@@ -0,0 +1,30 @@
+#include <shadow.h>
+#include <stdio.h>
+
+int putspent(const struct spwd *sp, FILE *f)
+{
+ flockfile(f);
+ if (sp->sp_namp && fputs(sp->sp_namp, f) == EOF) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_pwdp && fputs(sp->sp_pwdp, f) == EOF) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_lstchg != -1 && fprintf(f, "%d", sp->sp_lstchg) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_min != -1 && fprintf(f, "%d", sp->sp_min) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_max != -1 && fprintf(f, "%d", sp->sp_max) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_warn != -1 && fprintf(f, "%d", sp->sp_warn) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_inact != -1 && fprintf(f, "%d", sp->sp_inact) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_expire != -1 && fprintf(f, "%d", sp->sp_expire) < 0) goto fail;
+ if (fputc(':', f) == EOF) goto fail;
+ if (sp->sp_flag != -1 && fprintf(f, "%d", sp->sp_flag) < 0) goto fail;
+ if (fputc('\n', f) == EOF) goto fail;
+ funlockfile(f);
+ return 0;
+fail:
+ funlockfile(f);
+ return -1;
+}
--
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.
