Changeset 34230 in vbox

Timestamp:

Nov 22, 2010 10:06:48 AM (14 years ago)

Author:

vboxsync

Message:

iprt,VBoxServiceAutoMount.cpp: RTPathSetOwner[Ex] should take NIL_RTUID/GID not -1 / ~0, the only excuse is that NIL_RT[UG]ID probably didn't exist when it was written. Ditto for the RTFileSetOwner API (not realized yet).

Location:

trunk

Files:

• include/iprt/file.h (modified) (1 diff)
• include/iprt/path.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/path2-posix.cpp (modified) (1 diff)

trunk/include/iprt/file.h

@@ -763 +763 @@
  * @returns iprt status code.
  * @param   File        Handle to the file.
- * @param   uid         The new file owner user id. Use -1 (or ~0) to leave this unchanged.
- * @param   gid         The new group id. Use -1 (or ~0) to leave this unchanged.
+ * @param   uid         The new file owner user id.  Pass NIL_RTUID to leave
+ *                      this unchanged.
+ * @param   gid         The new group id.  Pass NIL_RTGID to leave this
+ *                      unchanged.
  */
 RTR3DECL(int) RTFileSetOwner(RTFILE File, uint32_t uid, uint32_t gid);

trunk/include/iprt/path.h

@@ -811 +811 @@
  * @returns iprt status code.
  * @param   pszPath     Path to the file system object.
- * @param   uid         The new file owner user id. Use -1 (or ~0) to leave this unchanged.
- * @param   gid         The new group id. Use -1 (or ~0) to leave this unchanged.
+ * @param   uid         The new file owner user id.  Pass NIL_RTUID to leave
+ *                      this unchanged.
+ * @param   gid         The new group id.  Pass NIL_RTGUID to leave this
+ *                      unchanged.
  */
 RTR3DECL(int) RTPathSetOwner(const char *pszPath, uint32_t uid, uint32_t gid);
@@ -821 +823 @@
  * @returns iprt status code.
  * @param   pszPath     Path to the file system object.
- * @param   uid         The new file owner user id. Use -1 (or ~0) to leave this unchanged.
- * @param   gid         The new group id. Use -1 (or ~0) to leave this unchanged.
+ * @param   uid         The new file owner user id.  Pass NIL_RTUID to leave
+ *                      this unchanged.
+ * @param   gid         The new group id.  Pass NIL_RTGID to leave this
+ *                      unchanged.
  * @param   fFlags      RTPATH_F_ON_LINK or RTPATH_F_FOLLOW_LINK.
  */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -179 +179 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTPathSetOwnerEx(pszMountPoint, ~0 /* Owner, unchanged */, pOpts->gid, RTPATH_F_ON_LINK);
+        rc = RTPathSetOwnerEx(pszMountPoint, NIL_RTUID /* Owner, unchanged */, pOpts->gid, RTPATH_F_ON_LINK);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Runtime/r3/posix/path2-posix.cpp

@@ -244 +244 @@
     AssertReturn(*pszPath, VERR_INVALID_PARAMETER);
     AssertMsgReturn(RTPATH_F_IS_VALID(fFlags, 0), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
-    uid_t uidNative = uid != UINT32_MAX ? (uid_t)uid : (uid_t)-1;
+    uid_t uidNative = uid != NIL_RTUID ? (uid_t)uid : (uid_t)-1;
     AssertReturn(uid == uidNative, VERR_INVALID_PARAMETER);
-    gid_t gidNative = gid != UINT32_MAX ? (gid_t)gid : (uid_t)-1;
+    gid_t gidNative = gid != NIL_RTGID ? (gid_t)gid : (uid_t)-1;
     AssertReturn(gid == gidNative, VERR_INVALID_PARAMETER);