Changeset b7ee0369 in mainline for uspace/lib/posix/pwd.c

Timestamp:

2011-07-31T05:08:44Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d3e241a

Parents:

051e6ac (diff), 27a8d1d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

• uspace/lib/posix/pwd.c (modified) (7 diffs)

uspace/lib/posix/pwd.c

@@ -39 +39 @@
 #include "errno.h"
 
-// TODO: documentation
-
 static bool entry_read = false;
 
@@ -46 +44 @@
 static const struct posix_passwd dummy_pwd = {
         .pw_name = (char *) "user",
-        .pw_uid = 1,
-        .pw_gid = 1,
+        .pw_uid = 0,
+        .pw_gid = 0,
         .pw_dir = (char *) "/",
         .pw_shell = (char *) "/app/bdsh"
@@ -115 +113 @@
 {
         assert(name != NULL);
+        assert(pwd != NULL);
+        assert(buffer != NULL);
+        assert(result != NULL);
         
         if (posix_strcmp(name, "user") != 0) {
@@ -121 +122 @@
         }
         
-        return posix_getpwuid_r(1, pwd, buffer, bufsize, result);
+        return posix_getpwuid_r(0, pwd, buffer, bufsize, result);
 }
 
@@ -132 +133 @@
 struct posix_passwd *posix_getpwuid(posix_uid_t uid)
 {
-        if (uid != 1) {
+        if (uid != 0) {
                 return NULL;
         }
@@ -159 +160 @@
             '/', '\0', 'b', 'd', 's', 'h', '\0' };
         
-        if (uid != 1) {
+        if (uid != 0) {
                 *result = NULL;
                 return 0;
@@ -171 +172 @@
 
         pwd->pw_name = (char *) bf;
-        pwd->pw_uid = 1;
-        pwd->pw_gid = 1;
+        pwd->pw_uid = 0;
+        pwd->pw_gid = 0;
         pwd->pw_dir = (char *) bf + 5;
         pwd->pw_shell = (char *) bf + 7;