Reformat all C files.
I'll push a formatting guide at some point. There may still be outstanding changes, but please feel free to resolve those as you arrive a them. To the best of my knowledge, there is no changes to the actual code content, but the formatter does have the occasional bug. If you run into an issue, please fix it!
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 unixres.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 unixres.c $NHDT-Date: 1431192779 2015/05/09 17:32:59 $ $NHDT-Branch: master $:$NHDT-Revision: 1.11 $ */
|
||||
/* NetHack 3.6 unixres.c $Date: 2009/05/06 10:50:57 $ $Revision: 1.8 $ */
|
||||
/* SCCS Id: @(#)unixres.c 3.5 2001/07/08 */
|
||||
/* Copyright (c) Slash'EM development team, 2001. */
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#ifdef GETRES_SUPPORT
|
||||
|
||||
# if defined(LINUX)
|
||||
#if defined(LINUX)
|
||||
|
||||
/* requires dynamic linking with libc */
|
||||
#include <dlfcn.h>
|
||||
@@ -32,7 +32,8 @@ uid_t *ruid, *euid, *suid;
|
||||
int (*f)(uid_t *, uid_t *, uid_t *); /* getresuid signature */
|
||||
|
||||
f = dlsym(RTLD_NEXT, "getresuid");
|
||||
if (!f) return -1;
|
||||
if (!f)
|
||||
return -1;
|
||||
|
||||
return f(ruid, euid, suid);
|
||||
}
|
||||
@@ -44,15 +45,16 @@ gid_t *rgid, *egid, *sgid;
|
||||
int (*f)(gid_t *, gid_t *, gid_t *); /* getresgid signature */
|
||||
|
||||
f = dlsym(RTLD_NEXT, "getresgid");
|
||||
if (!f) return -1;
|
||||
if (!f)
|
||||
return -1;
|
||||
|
||||
return f(rgid, egid, sgid);
|
||||
}
|
||||
|
||||
# else
|
||||
# if defined(BSD) || defined(SVR4)
|
||||
#else
|
||||
#if defined(BSD) || defined(SVR4)
|
||||
|
||||
# ifdef SYS_getresuid
|
||||
#ifdef SYS_getresuid
|
||||
|
||||
static int
|
||||
real_getresuid(ruid, euid, suid)
|
||||
@@ -61,7 +63,7 @@ uid_t *ruid, *euid, *suid;
|
||||
return syscall(SYS_getresuid, ruid, euid, suid);
|
||||
}
|
||||
|
||||
# else /* SYS_getresuid */
|
||||
#else /* SYS_getresuid */
|
||||
|
||||
#ifdef SVR4
|
||||
#include <sys/stat.h>
|
||||
@@ -75,21 +77,21 @@ uid_t *ruid, *euid, *suid;
|
||||
int pfd[2];
|
||||
struct stat st;
|
||||
if (pipe(pfd))
|
||||
return -1;
|
||||
return -1;
|
||||
retval = fstat(pfd[0], &st);
|
||||
close(pfd[0]);
|
||||
close(pfd[1]);
|
||||
if (!retval) {
|
||||
*euid = st.st_uid;
|
||||
*ruid = syscall(SYS_getuid);
|
||||
*suid = *ruid; /* Not supported under SVR4 */
|
||||
*euid = st.st_uid;
|
||||
*ruid = syscall(SYS_getuid);
|
||||
*suid = *ruid; /* Not supported under SVR4 */
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
# endif /* SYS_getresuid */
|
||||
#endif /* SYS_getresuid */
|
||||
|
||||
# ifdef SYS_getresgid
|
||||
#ifdef SYS_getresgid
|
||||
|
||||
static int
|
||||
real_getresgid(rgid, egid, sgid)
|
||||
@@ -98,7 +100,7 @@ gid_t *rgid, *egid, *sgid;
|
||||
return syscall(SYS_getresgid, rgid, egid, sgid);
|
||||
}
|
||||
|
||||
# else /* SYS_getresgid */
|
||||
#else /* SYS_getresgid */
|
||||
|
||||
static int
|
||||
real_getresgid(rgid, egid, sgid)
|
||||
@@ -108,21 +110,21 @@ gid_t *rgid, *egid, *sgid;
|
||||
int pfd[2];
|
||||
struct stat st;
|
||||
if (pipe(pfd))
|
||||
return -1;
|
||||
return -1;
|
||||
retval = fstat(pfd[0], &st);
|
||||
close(pfd[0]);
|
||||
close(pfd[1]);
|
||||
if (!retval) {
|
||||
*egid = st.st_gid;
|
||||
*rgid = syscall(SYS_getgid);
|
||||
*sgid = *rgid; /* Not supported under SVR4 */
|
||||
*egid = st.st_gid;
|
||||
*rgid = syscall(SYS_getgid);
|
||||
*sgid = *rgid; /* Not supported under SVR4 */
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
# endif /* SYS_getresgid */
|
||||
# endif /* BSD || SVR4 */
|
||||
# endif /* LINUX */
|
||||
#endif /* SYS_getresgid */
|
||||
#endif /* BSD || SVR4 */
|
||||
#endif /* LINUX */
|
||||
|
||||
static unsigned int hiding_privileges = 0;
|
||||
|
||||
@@ -135,9 +137,9 @@ hide_privileges(flag)
|
||||
boolean flag;
|
||||
{
|
||||
if (flag)
|
||||
hiding_privileges++;
|
||||
hiding_privileges++;
|
||||
else if (hiding_privileges)
|
||||
hiding_privileges--;
|
||||
hiding_privileges--;
|
||||
return hiding_privileges;
|
||||
}
|
||||
|
||||
@@ -147,7 +149,7 @@ uid_t *ruid, *euid, *suid;
|
||||
{
|
||||
int retval = real_getresuid(ruid, euid, suid);
|
||||
if (!retval && hiding_privileges)
|
||||
*euid = *suid = *ruid;
|
||||
*euid = *suid = *ruid;
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -165,7 +167,7 @@ nh_geteuid()
|
||||
uid_t ruid, euid, suid;
|
||||
(void) real_getresuid(&ruid, &euid, &suid);
|
||||
if (hiding_privileges)
|
||||
euid = ruid;
|
||||
euid = ruid;
|
||||
return euid;
|
||||
}
|
||||
|
||||
@@ -175,7 +177,7 @@ gid_t *rgid, *egid, *sgid;
|
||||
{
|
||||
int retval = real_getresgid(rgid, egid, sgid);
|
||||
if (!retval && hiding_privileges)
|
||||
*egid = *sgid = *rgid;
|
||||
*egid = *sgid = *rgid;
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -193,19 +195,19 @@ nh_getegid()
|
||||
gid_t rgid, egid, sgid;
|
||||
(void) real_getresgid(&rgid, &egid, &sgid);
|
||||
if (hiding_privileges)
|
||||
egid = rgid;
|
||||
egid = rgid;
|
||||
return egid;
|
||||
}
|
||||
|
||||
#else /* GETRES_SUPPORT */
|
||||
#else /* GETRES_SUPPORT */
|
||||
|
||||
# ifdef GNOME_GRAPHICS
|
||||
#ifdef GNOME_GRAPHICS
|
||||
int
|
||||
hide_privileges(flag)
|
||||
boolean flag;
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* GETRES_SUPPORT */
|
||||
#endif /* GETRES_SUPPORT */
|
||||
|
||||
Reference in New Issue
Block a user