hush: fix \<newline> handling on NOMMU

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

diff --git a/libpwdgrp/uidgid_get.c b/libpwdgrp/uidgid_get.c
index f10b40654672d9176d541ab883dfbf70c0fe0669..92290bfdb65dc74f5175b5b6f16b7729f889baf4 100644 (file)
--- a/libpwdgrp/uidgid_get.c
+++ b/libpwdgrp/uidgid_get.c
@@ -25,10 +25,10 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* Always sets uid and gid */
-int get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
+int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
 {
        struct passwd *pwd;
        struct group *gr;
@@ -76,21 +76,23 @@ int get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
        }
        return 1;
 }
+void FAST_FUNC xget_uidgid(struct bb_uidgid_t *u, const char *ug)
+{
+       if (!get_uidgid(u, ug, 1))
+               bb_error_msg_and_die("unknown user/group %s", ug);
+}
 
 /* chown-like:
  * "user" sets uid only,
  * ":group" sets gid only
  * "user:" sets uid and gid (to user's primary group id)
  * "user:group" sets uid and gid
- * ('unset' uid or gid is actually set to -1)
+ * ('unset' uid or gid retains the value it has on entry)
  */
-void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
+void FAST_FUNC parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
 {
        char *group;
 
-       u->uid = -1;
-       u->gid = -1;
-
        /* Check if there is a group name */
        group = strchr(user_group, '.'); /* deprecated? */
        if (!group)
@@ -106,8 +108,7 @@ void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
        } else {
                if (!group[1]) /* "user:" */
                        *group = '\0';
-               if (!get_uidgid(u, user_group, 1))
-                       bb_error_msg_and_die("unknown user/group %s", user_group);
+               xget_uidgid(u, user_group);
        }
 }