/usr/local/bin/diff -EBbu ./configure.orig ./configure --- ./configure.orig 2012-05-10 12:17:46 -0500 +++ ./configure 2012-07-04 02:55:44 -0500 @@ -13219,6 +13219,9 @@ #ifdef HAVE_NETINET_IN_H #include #endif +#ifdef __TANDEM +# include +#endif #ifdef HAVE_WINSOCK2_H #include #endif @@ -26496,7 +26499,7 @@ else dirfd_save_CFLAGS=$CFLAGS - for ac_expr in d_fd dd_fd; do + for ac_expr in d_fd dd_fd dd1; do # __TANDEM CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -39341,6 +39344,9 @@ #ifdef __cplusplus extern "C" #endif +#ifdef __TANDEM +# define getmntent floss_getmntent +#endif char getmntent (); int main () @@ -39382,10 +39388,10 @@ fi -for ac_func in getmntent +for ac_func in getmntent floss_getmntent # __TANDEM do : - ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent" -if test "x$ac_cv_func_getmntent" = xyes; then : + ac_fn_c_check_func "$LINENO" "$ac_func" "ac_cv_func_$ac_func" +if test "x$ac_cv_func_$ac_func" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GETMNTENT 1 _ACEOF @@ -39470,7 +39476,7 @@ fi fi -if test $ac_cv_func_getmntent = yes; then +if test $ac_cv_func_getmntent = yes || test $ac_cv_func_floss_getmntent = yes; then # __TANDEM # This system has the getmntent function. # Determine whether it's the one-argument variant or the two-argument one. @@ -39488,7 +39494,13 @@ /* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */ #include -#include +#ifdef __TANDEM +# define _FLOSS_USE_MNTENT +# include +# define MOUNTED "/dev/null" +#else +# include +#endif #if !defined MOUNTED # if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED @@ -62398,6 +62410,7 @@ #if (defined BOOT_TIME \ || (defined CTL_KERN && defined KERN_BOOTTIME) \ + || defined __TANDEM \ || HAVE_OS_H) /* your system *does* have the infrastructure to determine boot time */ #else /usr/local/bin/diff -EBbu ./lib/alloca.in.h.orig ./lib/alloca.in.h --- ./lib/alloca.in.h.orig 2012-02-11 03:53:07 -0600 +++ ./lib/alloca.in.h 2012-07-04 01:53:34 -0500 @@ -44,6 +44,13 @@ # define alloca _alloca # elif defined __DECC && defined __VMS # define alloca __ALLOCA +# elif defined __TANDEM && defined _TNS_E_TARGET +# ifdef __cplusplus +extern "C" +# endif +void *_alloca (unsigned short); +# pragma intrinsic (_alloca) +# define alloca _alloca # else # include # ifdef __cplusplus /usr/local/bin/diff -EBbu ./lib/closedir.c.orig ./lib/closedir.c --- ./lib/closedir.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/closedir.c 2012-06-26 16:33:45 -0500 @@ -41,6 +41,9 @@ { # if REPLACE_FCHDIR int fd = dirfd (dirp); +# ifdef __TANDEM + short fnum = DIR_TO_FD(dirp); +# endif # endif int retval; @@ -61,7 +64,14 @@ #if REPLACE_FCHDIR if (retval >= 0) +# ifdef __TANDEM + { + close (fd); + _gl_unregister_fnum (fnum); + } +# else _gl_unregister_fd (fd); +# endif #endif return retval; } /usr/local/bin/diff -EBbu ./lib/dirfd.c.orig ./lib/dirfd.c --- ./lib/dirfd.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/dirfd.c 2012-06-30 09:34:46 -0500 @@ -22,10 +22,18 @@ #include #include +#ifdef __TANDEM +# include /* for _gl_fnum2fd(), needed in C99 mode */ +#endif + int dirfd (DIR *dir_p) { +#ifdef __TANDEM + int fd = _gl_fnum2fd(DIR_TO_FD (dir_p)); +#else int fd = DIR_TO_FD (dir_p); +#endif if (fd == -1) errno = ENOTSUP; return fd; /usr/local/bin/diff -EBbu ./lib/euidaccess.c.orig ./lib/euidaccess.c --- ./lib/euidaccess.c.orig 2012-01-06 03:14:31 -0600 +++ ./lib/euidaccess.c 2012-06-30 09:36:03 -0500 @@ -30,6 +30,8 @@ #include #include +#include "root-uid.h" + #if HAVE_LIBGEN_H # include #endif @@ -140,7 +146,7 @@ /* The super-user can read and write any file, and execute any file that anyone can execute. */ - if (euid == 0 && ((mode & X_OK) == 0 + if (euid == ROOT_UID && ((mode & X_OK) == 0 || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) return 0; /usr/local/bin/diff -EBbu ./lib/fchdir.c.orig ./lib/fchdir.c --- ./lib/fchdir.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/fchdir.c 2012-07-05 11:23:09 -0500 @@ -53,6 +53,11 @@ } dir_info_t; static dir_info_t *dirs; static size_t dirs_allocated; +#ifdef __TANDEM +# define NOFD (-1) +static int *fnum2fdmap; +static size_t fds_allocated; +#endif /* Try to ensure dirs has enough room for a slot at index fd; free any contents already in that slot. Return false and set errno to @@ -84,6 +89,35 @@ return true; } +#ifdef __TANDEM +static bool +ensure_fd_slot (short fnum) +{ + if (fnum < fds_allocated) + fnum2fdmap[fnum] = NOFD; + else + { + size_t new_allocated; + int *new; + + new_allocated = 2 * fds_allocated + 1; + if (new_allocated <= fnum) + new_allocated = fnum + 1; + new = + (fnum2fdmap != NULL + ? realloc (fnum2fdmap, new_allocated * sizeof *new) + : malloc (new_allocated * sizeof *new)); + if (new == NULL) + return false; + memset (new + fds_allocated, NOFD, + (new_allocated - fds_allocated) * sizeof *new); + fnum2fdmap = new; + fds_allocated = new_allocated; + } + return true; +} +#endif + /* Return an absolute name of DIR in malloc'd storage. */ static char * get_name (char const *dir) @@ -134,7 +168,11 @@ assert (0 <= fd); if (REPLACE_OPEN_DIRECTORY +#ifdef __TANDEM /* check on the directory itself, not on a 'dummy' fd */ + || (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))) +#else || (fstat (fd, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))) +#endif { if (!ensure_dirs_slot (fd) || (dirs[fd].name = get_name (filename)) == NULL) @@ -197,6 +235,31 @@ return NULL; } +#ifdef __TANDEM +short _gl_register_fnum (int fd, short fnum) +{ + if (!ensure_fd_slot (fnum)) + { + int saved_errno = errno; + close (fd); + errno = saved_errno; + return -1; + } + fnum2fdmap[fnum] = fd; + return fnum; +} + +void _gl_unregister_fnum (short fnum) +{ + if (fnum >= 0 && fnum < fds_allocated) + fnum2fdmap[fnum] = NOFD; +} + +int _gl_fnum2fd (int fnum) +{ + return fnum2fdmap[fnum]; +} +#endif /* Implement fchdir() in terms of chdir(). */ /usr/local/bin/diff -EBbu ./lib/getaddrinfo.c.orig ./lib/getaddrinfo.c --- ./lib/getaddrinfo.c.orig 2012-02-11 03:53:08 -0600 +++ ./lib/getaddrinfo.c 2012-06-30 05:48:58 -0500 @@ -26,6 +26,9 @@ #if HAVE_NETINET_IN_H # include #endif +#ifdef __TANDEM +# include +#endif /* Get inet_ntop. */ #include /usr/local/bin/diff -EBbu ./lib/getcwd.c.orig ./lib/getcwd.c --- ./lib/getcwd.c.orig 2012-01-06 03:14:31 -0600 +++ ./lib/getcwd.c 2012-07-19 11:34:01 -0500 @@ -135,7 +135,7 @@ size_t allocated = size; size_t used; -#if HAVE_RAW_DECL_GETCWD && HAVE_MINIMALLY_WORKING_GETCWD +#if (HAVE_RAW_DECL_GETCWD && HAVE_MINIMALLY_WORKING_GETCWD) || __TANDEM /* If AT_FDCWD is not defined, the algorithm below is O(N**2) and this is much slower than the system getcwd (at least on GNU/Linux). So trust the system getcwd's results unless they /usr/local/bin/diff -EBbu ./lib/getugroups.c.orig ./lib/getugroups.c --- ./lib/getugroups.c.orig 2012-01-06 03:14:31 -0600 +++ ./lib/getugroups.c 2012-07-06 02:32:34 -0500 @@ -109,7 +109,11 @@ } } +#ifdef __TANDEM /* we return ENOENT at end of list */ + if (errno != 0 && errno != ENOENT) +#else if (errno != 0) +#endif count = -1; done: /usr/local/bin/diff -EBbu ./lib/i-ring.h.orig ./lib/i-ring.h --- ./lib/i-ring.h.orig 2012-07-05 11:21:38 -0500 +++ ./lib/i-ring.h 2012-07-05 11:21:06 -0500 @@ -17,7 +17,11 @@ #include #include "verify.h" +#ifdef __TANDEM /* Hack?! */ +enum { I_RING_SIZE = 512 }; +#else enum { I_RING_SIZE = 4 }; +#endif verify (1 <= I_RING_SIZE); /* When ir_empty is true, the ring is empty. /usr/local/bin/diff -EBbu ./lib/mountlist.c.orig ./lib/mountlist.c --- ./lib/mountlist.c.orig 2012-01-06 03:14:31 -0600 +++ ./lib/mountlist.c 2012-06-18 10:05:59 -0500 @@ -57,7 +57,13 @@ #endif /* MOUNTED_GETFSSTAT */ #ifdef MOUNTED_GETMNTENT1 /* 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ +# ifdef __TANDEM +# define _FLOSS_USE_MNTENT +# include +# define MOUNTED "/dev/null" +# else # include +# endif # if !defined MOUNTED # if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED /usr/local/bin/diff -EBbu ./lib/open.c.orig ./lib/open.c --- ./lib/open.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/open.c 2012-07-01 07:43:08 -0500 @@ -116,6 +116,13 @@ #endif fd = orig_open (filename, flags, mode); +#ifdef __TANDEM + /* On NonStop open(2) can open an OSS directory, but not /G & /E + directory, hence we do a dummy open here and override fstat() in + fchdir.c to hide the fact that we have a dummy. */ + if (fd < 0 && errno == EISDIR) + fd = open ("/dev/null", flags, mode); +#endif #if REPLACE_FCHDIR /* Implementing fchdir and fdopendir requires the ability to open a /usr/local/bin/diff -EBbu ./lib/opendir.c.orig ./lib/opendir.c --- ./lib/opendir.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/opendir.c 2012-07-01 07:29:25 -0500 @@ -27,6 +27,9 @@ /* Override opendir(), to keep track of the open file descriptors. Needed because there is a function dirfd(). */ +# ifdef __TANDEM +# include /* for open() and O_RDONLY */ +# endif #else # include @@ -51,6 +54,17 @@ if (dirp == NULL) return NULL; +# ifdef __TANDEM + /* On NonStop a opendir will not associate a fd with a open directory + So open the same directory using open(2) & get a valid fd. */ + int fd = open(dir_name, O_RDONLY); + if (fd < 0) + { + /* Clean up before exit */ + closedir(dirp); + return NULL; + } +# endif #else char dir_name_mask[MAX_PATH + 1 + 1 + 1]; @@ -133,11 +147,19 @@ #if REPLACE_FCHDIR { +# ifdef __TANDEM + /* rpl_open would have already registered the fd, just map the fnum & fd. */ + if (0 <= fd && _gl_register_fnum (fd, DIR_TO_FD(dirp)) != DIR_TO_FD(dirp)) +# else int fd = dirfd (dirp); if (0 <= fd && _gl_register_fd (fd, dir_name) != fd) +# endif { int saved_errno = errno; closedir (dirp); +# ifdef __TANDEM + close(fd); +# endif errno = saved_errno; return NULL; } /usr/local/bin/diff -EBbu ./lib/readutmp.h.orig ./lib/readutmp.h --- ./lib/readutmp.h.orig 2012-01-06 01:20:50 -0600 +++ ./lib/readutmp.h 2012-06-18 10:05:59 -0500 @@ -143,7 +143,11 @@ typedef struct UTMP_STRUCT_NAME STRUCT_UTMP; +#ifdef __TANDEM /* ToDo ?!? */ +enum { UT_USER_SIZE }; +#else enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) }; +#endif # if !defined UTMP_FILE && defined _PATH_UTMP # define UTMP_FILE _PATH_UTMP /usr/local/bin/diff -EBbu ./lib/regcomp.c.orig ./lib/regcomp.c --- ./lib/regcomp.c.orig 2012-04-04 07:07:01 -0500 +++ ./lib/regcomp.c 2012-06-27 03:13:17 -0500 @@ -899,8 +899,10 @@ != 0); #else codeset_name = nl_langinfo (CODESET); - if (strcasecmp (codeset_name, "UTF-8") == 0 - || strcasecmp (codeset_name, "UTF8") == 0) + if ((codeset_name[0] == 'U' || codeset_name[0] == 'u') + && (codeset_name[1] == 'T' || codeset_name[1] == 't') + && (codeset_name[2] == 'F' || codeset_name[2] == 'f') + && strcmp (codeset_name + 3 + (codeset_name[3] == '-'), "8") == 0) dfa->is_utf8 = 1; /* We check exhaustively in the loop below if this charset is a /usr/local/bin/diff -EBbu ./lib/root-uid.h.orig ./lib/root-uid.h --- ./lib/root-uid.h.orig 2012-06-29 02:34:54 -0500 +++ ./lib/root-uid.h 2012-06-29 02:34:54 -0500 @@ -0,0 +1,27 @@ +/* The user ID that always has appropriate privileges in the POSIX sense. + Copyright 2012 Free Software Foundation, Inc. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Written by Paul Eggert. */ + +#ifndef ROOT_UID_H_ +#define ROOT_UID_H_ +/* The user ID that always has appropriate privileges in the POSIX sense. */ +#ifdef __TANDEM +# define ROOT_UID 65535 +#else +# define ROOT_UID 0 +#endif + +#endif /usr/local/bin/diff -EBbu ./lib/unistd.in.h.orig ./lib/unistd.in.h --- ./lib/unistd.in.h.orig 2012-05-04 04:04:48 -0500 +++ ./lib/unistd.in.h 2012-07-01 07:31:21 -0500 @@ -473,6 +473,13 @@ _GL_EXTERN_C void _gl_unregister_fd (int fd); _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd); _GL_EXTERN_C const char *_gl_directory_name (int fd); +#ifdef __TANDEM +_GL_EXTERN_C short _gl_register_fnum (int fd, short fnum) + _GL_ARG_NONNULL ((2)); +_GL_EXTERN_C int _gl_fnum2fd (int fd) + _GL_ARG_NONNULL ((1)); +_GL_EXTERN_C void _gl_unregister_fnum(short fnum); +#endif # else # if !@HAVE_DECL_FCHDIR@ /usr/local/bin/diff -EBbu ./lib/write-any-file.c.orig ./lib/write-any-file.c --- ./lib/write-any-file.c.orig 2012-01-06 01:20:50 -0600 +++ ./lib/write-any-file.c 2012-06-30 06:02:17 -0500 @@ -21,6 +21,7 @@ #include "write-any-file.h" #include "priv-set.h" +#include "root-uid.h" #include @@ -40,7 +41,7 @@ can = (priv_set_ismember (PRIV_FILE_DAC_WRITE) == 1); #else /* In traditional Unix, only root can unlink directories. */ - can = (geteuid () == 0); + can = (geteuid () == ROOT_UID); #endif can_write = can; initialized = true; /usr/local/bin/diff -EBbu ./m4/dirfd.m4.orig ./m4/dirfd.m4 --- ./m4/dirfd.m4.orig 2012-01-06 01:20:50 -0600 +++ ./m4/dirfd.m4 2012-01-06 01:20:50 -0600 @@ -51,7 +51,7 @@ [gl_cv_sys_dir_fd_member_name], [ dirfd_save_CFLAGS=$CFLAGS - for ac_expr in d_fd dd_fd; do + for ac_expr in d_fd dd_fd dd1; do # __TANDEM CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /usr/local/bin/diff -EBbu ./src/copy.c.orig ./src/copy.c --- ./src/copy.c.orig 2012-05-08 03:34:30 -0500 +++ ./src/copy.c 2012-07-01 07:35:16 -0500 @@ -51,6 +51,7 @@ #include "ignore-value.h" #include "ioblksize.h" #include "quote.h" +#include "root-uid.h" #include "same.h" #include "savedir.h" #include "stat-size.h" @@ -1127,7 +1132,7 @@ { bool access_changed = false; - if (!(sb.st_mode & S_IWUSR) && geteuid () != 0) + if (!(sb.st_mode & S_IWUSR) && geteuid () != ROOT_UID) access_changed = fchmod_or_lchmod (dest_desc, dst_name, 0600) == 0; if (!copy_attr (src_name, source_desc, dst_name, dest_desc, x) @@ -2703,7 +2708,7 @@ priv_freeset (pset); } #else - x->chown_privileges = x->owner_privileges = (geteuid () == 0); + x->chown_privileges = x->owner_privileges = (geteuid () == ROOT_UID); #endif } /usr/local/bin/diff -EBbu ./src/groups.c.orig ./src/groups.c --- ./src/groups.c.orig 2012-04-29 06:45:30 -0500 +++ ./src/groups.c 2012-06-18 10:06:02 -0500 @@ -96,8 +96,13 @@ if (optind == argc) { /* No arguments. Divulge the details of the current process. */ +#ifdef __TANDEM + uid_t NO_UID = 0x80000000; + gid_t NO_GID = 0x80000000; +#else uid_t NO_UID = -1; gid_t NO_GID = -1; +#endif errno = 0; ruid = getuid (); /usr/local/bin/diff -EBbu ./src/hostid.c.orig ./src/hostid.c --- ./src/hostid.c.orig 2012-04-29 06:31:00 -0500 +++ ./src/hostid.c 2012-06-18 10:06:02 -0500 @@ -22,6 +22,10 @@ #include #include +#ifdef __TANDEM /* netdb.h errnously declares it only for _GUARDIAN_SOCKETS */ +unsigned long gethostid(void); +#endif + #include "system.h" #include "long-options.h" #include "error.h" /usr/local/bin/diff -EBbu ./src/id.c.orig ./src/id.c --- ./src/id.c.orig 2012-05-02 03:31:47 -0500 +++ ./src/id.c 2012-06-18 10:21:13 -0500 @@ -212,8 +216,13 @@ /* POSIX says identification functions (getuid, getgid, and others) cannot fail, but they can fail under GNU/Hurd and a few other systems. Test for failure by checking errno. */ +#ifdef __TANDEM + uid_t NO_UID = 0x80000000; + gid_t NO_GID = 0x80000000; +#else uid_t NO_UID = -1; gid_t NO_GID = -1; +#endif if (just_user ? !use_real : !just_group && !just_group_list && !just_context) /usr/local/bin/diff -EBbu ./src/install.c.orig ./src/install.c --- ./src/install.c.orig 2012-05-02 03:31:47 -0500 +++ ./src/install.c 2012-06-18 10:21:56 -0500 @@ -199,7 +203,11 @@ { errno = 0; uid_t ruid = getuid (); +#ifdef __TANDEM + if ((ruid == (uid_t) 0x80000000 && errno) || dest_sb.st_uid != ruid) +#else if ((ruid == (uid_t) -1 && errno) || dest_sb.st_uid != ruid) +#endif return true; } else if (dest_sb.st_uid != owner_id) @@ -209,7 +217,11 @@ { errno = 0; gid_t rgid = getgid (); +#ifdef __TANDEM + if ((rgid == (uid_t) 0x80000000 && errno) || dest_sb.st_gid != rgid) +#else if ((rgid == (uid_t) -1 && errno) || dest_sb.st_gid != rgid) +#endif return true; } else if (dest_sb.st_gid != group_id) /usr/local/bin/diff -EBbu ./src/remove.c.orig ./src/remove.c --- ./src/remove.c.orig 2012-05-01 15:55:08 -0500 +++ ./src/remove.c 2012-06-18 10:06:04 -0500 @@ -88,6 +88,7 @@ return st; } +#ifndef __TANDEM /* not used anywhere */ /* Return true if *ST has been statted. */ static inline bool cache_statted (struct stat *st) @@ -101,6 +102,7 @@ { return (0 <= st->st_size); } +#endif /* !__TANDEM */ /* Return 1 if FILE is an unwritable non-symlink, 0 if it is writable or some other type of file, @@ -311,6 +313,7 @@ return RM_OK; } +#ifndef __TANDEM /* Return true if FILENAME is a directory (and not a symlink to a directory). Otherwise, including the case in which lstat fails, return false. *ST is FILENAME's tstatus. @@ -340,6 +343,7 @@ errno = saved_errno; return is_non_dir; } +#endif /* !__TANDEM */ /* When a function like unlink, rmdir, or fstatat fails with an errno value of ERRNUM, return true if the specified file system object /usr/local/bin/diff -EBbu ./src/stat.c.orig ./src/stat.c --- ./src/stat.c.orig 2012-05-10 08:15:59 -0500 +++ ./src/stat.c 2012-06-18 10:06:06 -0500 @@ -713,9 +717,15 @@ uintmax_t fsid = statfsbuf->f_fsid; #else typedef unsigned int fsid_word; +# ifdef __TANDEM + verify (alignof (STRUCT_STATVFS) % 4 == 0); + verify (offsetof (STRUCT_STATVFS, f_fsid) % 4 == 0); + verify (sizeof statfsbuf->f_fsid % 4 == 0); +# else verify (alignof (STRUCT_STATVFS) % alignof (fsid_word) == 0); verify (offsetof (STRUCT_STATVFS, f_fsid) % alignof (fsid_word) == 0); verify (sizeof statfsbuf->f_fsid % alignof (fsid_word) == 0); +# endif fsid_word const *p = (fsid_word *) &statfsbuf->f_fsid; /* Assume a little-endian word order, as that is compatible /usr/local/bin/diff -EBbu ./src/su.c.orig ./src/su.c --- ./src/su.c.orig 2012-05-04 04:02:43 -0500 +++ ./src/su.c 2012-06-30 06:55:57 -0500 @@ -55,6 +55,7 @@ #include "system.h" #include "getpass.h" +#include "root-uid.h" #if HAVE_SYSLOG_H && HAVE_SYSLOG # include @@ -109,7 +114,11 @@ #define DEFAULT_SHELL "/bin/sh" /* The user to become if none is specified. */ -#define DEFAULT_USER "root" +#ifdef __TANDEM +# define DEFAULT_USER "SUPER.SUPER" +#else +# define DEFAULT_USER "root" +#endif char *crypt (char const *key, char const *salt); @@ -162,7 +171,7 @@ const char *new_user, *old_user, *tty; # ifndef SYSLOG_NON_ROOT - if (pw->pw_uid) + if (pw->pw_uid != ROOT_UID) return; # endif new_user = pw->pw_name; @@ -175,7 +184,11 @@ Resort to getpwuid. */ errno = 0; uid_t ruid = getuid (); +#ifdef __TANDEM + uid_t NO_UID = 0x80000000; +#else uid_t NO_UID = -1; +#endif struct passwd *pwd = (ruid == NO_UID && errno ? NULL : getpwuid (ruid)); old_user = (pwd ? pwd->pw_name : ""); } @@ -223,7 +236,7 @@ #endif correct = pw->pw_passwd; - if (getuid () == 0 || !correct || correct[0] == '\0') + if (getuid () == ROOT_UID || !correct || correct[0] == '\0') return true; unencrypted = getpass (_("Password:")); @@ -492,7 +505,7 @@ if (!shell && !change_environment) shell = getenv ("SHELL"); - if (shell && getuid () != 0 && restricted_shell (pw->pw_shell)) + if (shell && getuid () != ROOT_UID && restricted_shell (pw->pw_shell)) { /* The user being su'd to has a nonstandard shell, and so is probably a uucp account or has restricted access. Don't /usr/local/bin/diff -EBbu ./src/system.h.orig ./src/system.h --- ./src/system.h.orig 2012-05-10 03:24:16 -0500 +++ ./src/system.h 2012-06-30 06:05:03 -0500 @@ -626,3 +626,7 @@ #ifndef ARRAY_CARDINALITY # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) #endif + +#ifdef __TANDEM /* Hack!?! */ +# undef putchar +#endif /usr/local/bin/diff -EBbu ./src/test.c.orig ./src/test.c --- ./src/test.c.orig 2012-05-10 02:14:30 -0500 +++ ./src/test.c 2012-06-18 10:06:07 -0500 @@ -425,7 +425,11 @@ return false; errno = 0; uid_t euid = geteuid (); +#ifdef __TANDEM + uid_t NO_UID = 0x80000000; +#else uid_t NO_UID = -1; +#endif return ! (euid == NO_UID && errno) && euid == stat_buf.st_uid; } @@ -436,7 +440,11 @@ return false; errno = 0; gid_t egid = getegid (); +#ifdef __TANDEM + gid_t NO_GID = 0x80000000; +#else gid_t NO_GID = -1; +#endif return ! (egid == NO_GID && errno) && egid == stat_buf.st_gid; } /usr/local/bin/diff -EBbu ./src/uptime.c.orig ./src/uptime.c --- ./src/uptime.c.orig 2012-05-01 15:55:08 -0500 +++ ./src/uptime.c 2012-06-18 10:06:08 -0500 # include #endif +#ifdef __TANDEM +# include +#endif + #include "c-strtod.h" #include "error.h" #include "long-options.h" @@ -50,15 +54,28 @@ print_uptime (size_t n, const STRUCT_UTMP *this) { size_t entries = 0; - time_t boot_time = 0; time_t time_now; - time_t uptime = 0; long int updays; - int uphours; - int upmins; struct tm *tmn; double avg[3]; int loads; +#ifdef __TANDEM + long long uptime; + short uphours, upmins; + + uptime = JULIANTIMESTAMP(3); + if ( (updays = INTERPRETINTERVAL(uptime, &uphours, &upmins)) < 0) { + printf("ret = %x\n", updays); + error (EXIT_FAILURE, errno, _("couldn't get boot time")); + } + + time_now = time (NULL); +#else /* !__TANDEM */ + time_t boot_time = 0; + time_t uptime = 0; + int uphours; + int upmins; + int upmins; #ifdef HAVE_PROC_UPTIME FILE *fp; @@ -128,6 +145,7 @@ updays = uptime / 86400; uphours = (uptime - (updays * 86400)) / 3600; upmins = (uptime - (updays * 86400) - (uphours * 3600)) / 60; +#endif /* !__TANDEM */ tmn = localtime (&time_now); /* procps' version of uptime also prints the seconds field, but previous versions of coreutils don't. */ /usr/local/bin/diff -EBbu ./src/whoami.c.orig ./src/whoami.c --- ./src/whoami.c.orig 2012-04-29 06:31:00 -0500 +++ ./src/whoami.c 2012-06-18 10:27:34 -0500 @@ -59,7 +63,11 @@ { struct passwd *pw; uid_t uid; +#ifdef __TANDEM + uid_t NO_UID = 0x80000000; +#else uid_t NO_UID = -1; +#endif initialize_main (&argc, &argv); set_program_name (argv[0]); /usr/local/bin/diff -EBbu ./tests/split/filter.orig ./tests/split/filter --- ./tests/split/filter.orig 2012-01-27 04:34:45 -0600 +++ ./tests/split/filter 2012-07-06 09:11:27 -0500 @@ -52,6 +52,8 @@ # Ensure that endless input is ignored when all filters finish timeout 10 yes | split --filter="head -c1 >/dev/null" -n r/1 || fail=1 -timeout 10 split --filter="head -c1 >/dev/null" -n 1 /dev/zero || fail=1 +# __TANDEM no /dev/zere here +timeout 10 split --filter="head -c1 >/dev/null" -n 1 /dev/null || fail=1 +#timeout 10 split --filter="head -c1 >/dev/null" -n 1 /dev/zero || fail=1 Exit $fail /usr/local/bin/diff -EBbu ./tests/touch/not-owner.orig ./tests/touch/not-owner --- ./tests/touch/not-owner.orig 2012-02-03 03:22:06 -0600 +++ ./tests/touch/not-owner 2012-07-06 09:08:54 -0500 @@ -34,7 +34,9 @@ # Before fileutils-4.1, we'd get the following misleading # diagnostic instead of '...: Permission denied'. # touch: creating '/': Is a directory -touch / > out 2>&1 && fail=1 +# __TANDEM +touch -c / > out 2>&1 && fail=1 +#touch / > out 2>&1 && fail=1 # On SunOS4, EPERM is 'Not owner'. # On some *BSD systems it's 'Operation not permitted'. @@ -45,6 +47,9 @@ cat > exp < /dev/null 2>&1 && { match=1; break; } done