From 4e3e5f299081f9215a58acfe1b3c59f7aa3f4161 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Fri, 28 Apr 2023 00:39:56 -0400 Subject: [PATCH] remove __ on uid and gid for alpine --- src/commands/groups.c | 4 ++-- src/commands/id.c | 6 +++--- src/commands/ls.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/commands/groups.c b/src/commands/groups.c index 1969edf..4aa7776 100644 --- a/src/commands/groups.c +++ b/src/commands/groups.c @@ -6,7 +6,7 @@ COMMAND_EMPTY(groups) { - __uid_t uid = getuid(); + uid_t uid = getuid(); struct passwd* pw = getpwuid(uid); if(pw == NULL){ @@ -16,7 +16,7 @@ COMMAND_EMPTY(groups) { int ngroups = 0; getgrouplist(pw->pw_name, pw->pw_gid, NULL, &ngroups); - __gid_t groups[ngroups]; + gid_t groups[ngroups]; getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); for (int i = 0; i < ngroups; i++){ diff --git a/src/commands/id.c b/src/commands/id.c index ab974b1..f1790bc 100644 --- a/src/commands/id.c +++ b/src/commands/id.c @@ -6,8 +6,8 @@ COMMAND_EMPTY(user_id) { - __uid_t uid = getuid(); - __gid_t gid = getgid(); + uid_t uid = getuid(); + gid_t gid = getgid(); struct passwd* pw = getpwuid(uid); if(pw == NULL){ @@ -17,7 +17,7 @@ COMMAND_EMPTY(user_id) { int ngroups = 0; getgrouplist(pw->pw_name, pw->pw_gid, NULL, &ngroups); - __gid_t groups[ngroups]; + gid_t groups[ngroups]; getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); struct group* ugr = getgrgid(gid); diff --git a/src/commands/ls.c b/src/commands/ls.c index beebd19..bcc042c 100644 --- a/src/commands/ls.c +++ b/src/commands/ls.c @@ -58,8 +58,8 @@ static void list_file(struct dirent* file, struct Flags* flags, const char* dir_ if (flags->more_info) { - __uid_t uid = getuid(); - __gid_t gid = getgid(); + uid_t uid = getuid(); + gid_t gid = getgid(); char buf[PATH_MAX]; append_path(buf, dir_path, file);