find: support -HLP

[oweals/busybox.git] / libpwdgrp / pwd_grp_internal.c

diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index 866ed3699011d953ef1f363d81ef9a8bf4d10943..d6483be84410d43309df92b8b487a2e861cf0c36 100644 (file)
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -1,28 +1,27 @@
 /* vi: set sw=4 ts=4: */
-/*  Copyright (C) 2003     Manuel Novoa III
+/* Copyright (C) 2003     Manuel Novoa III
  *
- *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/*  Nov 6, 2003  Initial version.
+/* Nov 6, 2003  Initial version.
  *
- *  NOTE: This implementation is quite strict about requiring all
+ * NOTE: This implementation is quite strict about requiring all
  *    field seperators.  It also does not allow leading whitespace
  *    except when processing the numeric fields.  glibc is more
  *    lenient.  See the various glibc difference comments below.
  *
- *  TODO:
+ * TODO:
  *    Move to dynamic allocation of (currently statically allocated)
  *      buffers; especially for the group-related functions since
  *      large group member lists will cause error returns.
- *
  */
 
 #ifndef GETXXKEY_R_FUNC
 #error GETXXKEY_R_FUNC is not defined!
 #endif
 
-int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+int GETXXKEY_R_FUNC(GETXXKEY_R_KEYTYPE key,
                                GETXXKEY_R_ENTTYPE *__restrict resultbuf,
                                char *__restrict buffer, size_t buflen,
                                GETXXKEY_R_ENTTYPE **__restrict result)
@@ -32,18 +31,18 @@ int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
 
        *result = NULL;
 
-       stream = fopen(DO_GETXXKEY_R_PATHNAME, "r");
+       stream = fopen_for_read(GETXXKEY_R_PATHNAME);
        if (!stream)
                return errno;
        while (1) {
-               rv = __pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream);
+               rv = bb__pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream);
                if (!rv) {
-                       if (GETXXKEY_R_TEST(resultbuf)) { /* Found key? */
+                       if (GETXXKEY_R_TEST(resultbuf)) { /* found key? */
                                *result = resultbuf;
                                break;
                        }
                } else {
-                       if (rv == ENOENT) {     /* end-of-file encountered. */
+                       if (rv == ENOENT) {  /* EOF encountered */
                                rv = 0;
                        }
                        break;
@@ -58,5 +57,5 @@ int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
 #undef GETXXKEY_R_PARSER
 #undef GETXXKEY_R_ENTTYPE
 #undef GETXXKEY_R_TEST
-#undef DO_GETXXKEY_R_KEYTYPE
-#undef DO_GETXXKEY_R_PATHNAME
+#undef GETXXKEY_R_KEYTYPE
+#undef GETXXKEY_R_PATHNAME