The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / openbsd-compat / bsd-misc.c

diff --git a/openssh/openbsd-compat/bsd-misc.c b/openssh/openbsd-compat/bsd-misc.c
index 4373ce24aeaaef2eb19cc015d06f79669a6fcd56..d87d56218c8a856c39e185f3ca62b0295b45a604 100644 (file)
--- a/openssh/openbsd-compat/bsd-misc.c
+++ b/openssh/openbsd-compat/bsd-misc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
+ * Copyright (c) 1999-2000 Damien Miller.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,39 +23,33 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
 
 RCSID("$Id$");
 
-/*
- * NB. duplicate __progname in case it is an alias for argv[0]
- * Otherwise it may get clobbered by setproctitle()
- */
-char *ssh_get_progname(char *argv0)
+char *get_progname(char *argv0)
 {
 #ifdef HAVE___PROGNAME
        extern char *__progname;
 
-       return xstrdup(__progname);
+       return __progname;
 #else
        char *p;
 
        if (argv0 == NULL)
-               return ("unknown");     /* XXX */
+               return "unknown";       /* XXX */
        p = strrchr(argv0, '/');
        if (p == NULL)
                p = argv0;
        else
                p++;
-
-       return (xstrdup(p));
+       return p;
 #endif
 }
 
 #ifndef HAVE_SETLOGIN
 int setlogin(const char *name)
 {
-       return (0);
+       return(0);
 }
 #endif /* !HAVE_SETLOGIN */
 
@@ -63,21 +57,21 @@ int setlogin(const char *name)
 int innetgr(const char *netgroup, const char *host, 
             const char *user, const char *domain)
 {
-       return (0);
+       return(0);
 }
 #endif /* HAVE_INNETGR */
 
 #if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
 int seteuid(uid_t euid)
 {
-       return (setreuid(-1, euid));
+       return(setreuid(-1,euid));
 }
 #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */
 
 #if !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID)
 int setegid(uid_t egid)
 {
-       return(setresgid(-1, egid, -1));
+       return(setresgid(-1,egid,-1));
 }
 #endif /* !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID) */
 
@@ -88,9 +82,9 @@ const char *strerror(int e)
        extern char *sys_errlist[];
        
        if ((e >= 0) && (e < sys_nerr))
-               return (sys_errlist[e]);
-
-       return ("unlisted error");
+               return(sys_errlist[e]);
+       else
+               return("unlisted error");
 }
 #endif
 
@@ -99,130 +93,9 @@ int utimes(char *filename, struct timeval *tvp)
 {
        struct utimbuf ub;
 
-       ub.actime = tvp[0].tv_sec;
-       ub.modtime = tvp[1].tv_sec;
+       ub.actime = tvp->tv_sec;
+       ub.modtime = tvp->tv_usec;
        
-       return (utime(filename, &ub));
-}
-#endif 
-
-#ifndef HAVE_TRUNCATE
-int truncate(const char *path, off_t length)
-{
-       int fd, ret, saverrno;
-
-       fd = open(path, O_WRONLY);
-       if (fd < 0)
-               return (-1);
-
-       ret = ftruncate(fd, length);
-       saverrno = errno;
-       close(fd);
-       if (ret == -1)
-               errno = saverrno;
-
-       return(ret);
-}
-#endif /* HAVE_TRUNCATE */
-
-#if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP)
-/*
- * Cygwin setgroups should be a noop.
- */
-int
-setgroups(size_t size, const gid_t *list)
-{
-       return (0);
+       return(utime(filename, &ub));
 }
 #endif 
-
-#if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP)
-int nanosleep(const struct timespec *req, struct timespec *rem)
-{
-       int rc, saverrno;
-       extern int errno;
-       struct timeval tstart, tstop, tremain, time2wait;
-
-       TIMESPEC_TO_TIMEVAL(&time2wait, req)
-       (void) gettimeofday(&tstart, NULL);
-       rc = select(0, NULL, NULL, NULL, &time2wait);
-       if (rc == -1) {
-               saverrno = errno;
-               (void) gettimeofday (&tstop, NULL);
-               errno = saverrno;
-               tremain.tv_sec = time2wait.tv_sec - 
-                       (tstop.tv_sec - tstart.tv_sec);
-               tremain.tv_usec = time2wait.tv_usec - 
-                       (tstop.tv_usec - tstart.tv_usec);
-               tremain.tv_sec += tremain.tv_usec / 1000000L;
-               tremain.tv_usec %= 1000000L;
-       } else {
-               tremain.tv_sec = 0;
-               tremain.tv_usec = 0;
-       }
-       TIMEVAL_TO_TIMESPEC(&tremain, rem)
-
-       return(rc);
-}
-
-#endif
-
-#ifndef HAVE_TCGETPGRP
-pid_t
-tcgetpgrp(int fd)
-{
-       int ctty_pgrp;
-
-       if (ioctl(fd, TIOCGPGRP, &ctty_pgrp) == -1)
-               return(-1);
-       else
-               return(ctty_pgrp);
-}
-#endif /* HAVE_TCGETPGRP */
-
-#ifndef HAVE_TCSENDBREAK
-int
-tcsendbreak(int fd, int duration)
-{
-# if defined(TIOCSBRK) && defined(TIOCCBRK)
-       struct timeval sleepytime;
-
-       sleepytime.tv_sec = 0;
-       sleepytime.tv_usec = 400000;
-       if (ioctl(fd, TIOCSBRK, 0) == -1)
-               return (-1);
-       (void)select(0, 0, 0, 0, &sleepytime);
-       if (ioctl(fd, TIOCCBRK, 0) == -1)
-               return (-1);
-       return (0);
-# else
-       return -1;
-# endif
-}
-#endif /* HAVE_TCSENDBREAK */
-
-mysig_t
-mysignal(int sig, mysig_t act)
-{
-#ifdef HAVE_SIGACTION
-       struct sigaction sa, osa;
-
-       if (sigaction(sig, NULL, &osa) == -1)
-               return (mysig_t) -1;
-       if (osa.sa_handler != act) {
-               memset(&sa, 0, sizeof(sa));
-               sigemptyset(&sa.sa_mask);
-               sa.sa_flags = 0;
-#ifdef SA_INTERRUPT
-               if (sig == SIGALRM)
-                       sa.sa_flags |= SA_INTERRUPT;
-#endif
-               sa.sa_handler = act;
-               if (sigaction(sig, &sa, NULL) == -1)
-                       return (mysig_t) -1;
-       }
-       return (osa.sa_handler);
-#else
-       return (signal(sig, act));
-#endif
-}