* fhandler_tape.cc (get_ll): This is a generally useful function so move it

* winsup.h (get_ll): to here
* security.cc (get_token_group_sidlist): Use get_ll to figure out the long long
version of the luid since QuadPart is not part of the standard Windows API.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b92fedb88b3a5c09d07417f641a7c59e66d200a8..b3a7eb903a74046a3ffa28e838e9f89f938b3c20 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-16  Christopher Faylor  <cgf@timesys.com>
+
+       * fhandler_tape.cc (get_ll): This is a generally useful function so
+       move it
+       * winsup.h (get_ll): to here
+       * security.cc (get_token_group_sidlist): Use get_ll to figure out the
+       long long version of the luid since QuadPart is not part of the
+       standard Windows API.
+
 2005-03-16  Christopher Faylor  <cgf@timesys.com>
 
        * dir.cc: Rename opendir_* to dirent_* throughout.

diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 5b7c69909f2d62db2d1afe6343801f985f699425..33850e329e1ebd243930c33a12f3d7ad53de6a95 100644 (file)
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -36,9 +36,6 @@ details. */
                            part (partition)->initialize (0); \
                          }
 
-/* Convert LARGE_INTEGER into long long */
-#define get_ll(pl)  (((long long) (pl).HighPart << 32) | (pl).LowPart)
-
 #define IS_BOT(err) ((err) == ERROR_BEGINNING_OF_MEDIA)
 
 #define IS_EOF(err) ((err) == ERROR_FILEMARK_DETECTED \

diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 14f4013354285741b7f1545624b8b30b84e01284..40914ff4a69c475c0366b65deef0b4015eab514b 100644 (file)
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -534,7 +534,7 @@ get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps,
       grp_list += well_known_local_sid;
       grp_list += well_known_interactive_sid;
     }
-  if (auth_luid.QuadPart != 999) /* != SYSTEM_LUID */
+  if (get_ll (auth_luid) != 999LL) /* != SYSTEM_LUID */
     {
       char buf[64];
       __small_sprintf (buf, "S-1-5-5-%u-%u", auth_luid.HighPart,

diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 794fa720f549f24b457df322f7a9c6f22ce9e87a..f8c060bd71fb14b7d7d8bd19608095e0997993cd 100644 (file)
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -214,6 +214,9 @@ void uinfo_init (void);
 #define uid16touid32(u16)  ((u16)==ILLEGAL_UID16?ILLEGAL_UID:(__uid32_t)(u16))
 #define gid16togid32(g16)  ((g16)==ILLEGAL_GID16?ILLEGAL_GID:(__gid32_t)(g16))
 
+/* Convert LARGE_INTEGER into long long */
+#define get_ll(pl)  (((long long) (pl).HighPart << 32) | (pl).LowPart)
+
 /* various events */
 void events_init (void);
 void events_terminate (void);