mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Michael Forney <mforney@mforney.org>
To: musl@lists.openwall.com
Subject: [PATCH] shadow: Implement putspent
Date: Mon,  4 Nov 2013 23:47:40 -0800	[thread overview]
Message-ID: <1383637660-7768-1-git-send-email-mforney@mforney.org> (raw)

---
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



             reply	other threads:[~2013-11-05  7:47 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-05  7:47 Michael Forney [this message]
2013-11-05 19:24 ` Rich Felker
2013-11-05 22:30   ` [PATCH v2] " Michael Forney
2013-11-05 23:31     ` Rich Felker
2013-11-06 13:20       ` Jens Gustedt
2013-11-06 16:36         ` Rich Felker
2013-11-07 22:35           ` Jens Gustedt
2013-11-08  0:37             ` Szabolcs Nagy
2013-11-24  6:10       ` [PATCH v3] " Michael Forney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383637660-7768-1-git-send-email-mforney@mforney.org \
    --to=mforney@mforney.org \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).