remove OSF1 support

cde/programs/dtfile/FileDialog.c

@@ -67,10 +67,6 @@
 #endif
 #endif
 
-#ifdef __osf__
-#include <unistd.h>
-#endif
-
 #include <Xm/DialogS.h>
 #include <Xm/Frame.h>
 #include <Xm/Form.h>

cde/programs/dtfile/FileManip.c

@@ -79,12 +79,6 @@
 #include <ufs/fs.h>
 #endif
 #else
-#ifdef __hp_osf
-#include <unistd.h>
-#include <limits.h>
-#include <ufs/fs.h>
-#include <sys/access.h>
-#else
 #ifdef __ultrix
 #include <unistd.h>
 #include <limits.h>
@@ -96,13 +90,8 @@
 #include <unistd.h>
 #endif
 #endif /* __ultrix */
-#endif /* __hp_osf */
 #endif /* sun */
 
-#ifdef __osf__
-#include <ufs/fs.h>
-#endif
-
 #include <Xm/Xm.h>
 
 #include <Xm/MwmUtil.h>
@@ -145,9 +134,9 @@ CheckAccess(
     uid_t save_ruid;
     gid_t save_rgid;
 
-#if defined(__hp_osf) || defined(__ultrix)
+#if defined(__ultrix)
 /*--------------------------------------------------------------------
- * access code for __hp_osf, __ultrix
+ * access code for __ultrix
  *------------------------------------------------------------------*/
 
       setreuid(geteuid(),-1);
@@ -192,7 +181,7 @@ CheckAccess(
 
    return access_priv;
 #endif /* BLS */
-#endif /* Apollo & OSF */
+#endif /* Apollo */
 }
 
 
@@ -986,7 +975,7 @@ FileManip(
    if (lstat (to, &s2) >= 0) 			   /* <to> exists */
    {
       if ((stat (to, &s3) >= 0) &&
-#if defined(__hp_osf) || (__ultrix) || defined(__osf__) || defined(linux) || \
+#if defined(__ultrix) || defined(linux) || \
 	defined(CSRG_BASED)
            (((s3.st_mode & S_IFMT) == S_IFDIR)          /* if is a directory */
            || ((s3.st_mode & S_IFMT) == S_IFSOCK)) )    /* or a net special */

cde/programs/dtfile/FileMgr.c

@@ -2337,11 +2337,7 @@ ActivateClist(
         (( isalpha( tmp[i] ) ) ? (message[i] = (int)(tmp[i]) - 1) : (message[i] = tmp[i]));
       };
 
-#ifdef __osf__
-      sscanf( params[0], "%lx", &fileMgrRec );
-#else
       sscanf( params[0], "%p", (void **) &fileMgrRec );
-#endif
       _DtMessage(toplevel, title, message, NULL, HelpRequestCB);
       XtFree( title );
       XtFree( message );
@@ -6398,11 +6394,7 @@ FMInput(
 
     if( *(params[0]) != '@' )
     {
-#ifdef __osf__
-        sscanf( params[0], "%lx", &fileMgrRec );
-#else
         sscanf( params[0], "%p", (void **) &fileMgrRec );
-#endif
       FileWindowInputCallback( wid, (XtPointer)fileMgrRec, (XtPointer)&cb );
     }
 

cde/programs/dtfile/FileOp.c

@@ -80,10 +80,6 @@
 #include <time.h>
 #include <utime.h>
 
-#ifdef __osf__
-#include <unistd.h>
-#endif
-
 #ifdef _AIX
 #include <sys/select.h>
 #endif
@@ -2252,9 +2248,6 @@ _FileMoveCopy(
    cb_data->pipe_m2s = pipe_m2s[1];
    cb_data->pipe_s2m = pipe_s2m[0];
    cb_data->mode = mode;
-#ifdef __osf__
-   cb_data->child = pid;
-#endif
 
    /*
     * We wait a certain amount of time for the background process to finish.

cde/programs/dtfile/Find.c

@@ -1735,9 +1735,6 @@ ExecuteFind(
    char *link_path;
    void (*oldSig)();
    Tt_status tt_status;
-#ifdef __osf__
-   extern void sigchld_handler(int);
-#endif /* __osf__ */
    int rv;
 
    if(strcmp(find_data->content, "") == 0)
@@ -1824,7 +1821,7 @@ ExecuteFind(
    if (access_priv == -1 && geteuid() != root_user)
    {
 #else
-#  if defined(__hp_osf) || defined(__ultrix) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#  if defined(__ultrix) || defined(linux) || defined(CSRG_BASED)
    rv = setreuid(geteuid(),-1);
    if (access ((char *) path, R_OK) == -1)
    {
@@ -1839,7 +1836,7 @@ ExecuteFind(
              !(access_priv & R_OK)) && (geteuid () != root_user))
    {
 #    endif /* BLS */
-#  endif /* Apollo & OSF */
+#  endif /* Apollo */
 #endif /* SVR4 */
       /* Post an error dialog, and then terminate the request */
 
@@ -1918,11 +1915,7 @@ ExecuteFind(
 
    /* Start the 'find' process */
 
-#ifdef __osf__
-   oldSig = signal(SIGCHLD, sigchld_handler);
-#else
    oldSig = signal(SIGCHLD, SIG_DFL);
-#endif /* __osf__ */
    find_rec->popenId = findpopen(command, "r",&(find_rec->childpid));
    signal (SIGCHLD, oldSig);
 

cde/programs/dtfile/Main.c

@@ -116,9 +116,9 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#if defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 #include <sys/wait.h>
-#endif /* __osf__ */
+#endif /* CSRG_BASED */
 
 #include <errno.h>
 #include <pwd.h>
@@ -975,9 +975,9 @@ XtActionsRec actionTable[] = {
 
 extern XtInputId ProcessToolTalkInputId;
 
-#if defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 extern void sigchld_handler(int);
-#endif /* __osf__ */
+#endif /* CSRG_BASED */
 
 int
 main(
@@ -1019,9 +1019,9 @@ main(
    Tt_pattern requests2Handle;
    Tt_message msg;
    Tt_status status;
-#if defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
    struct sigaction sa, osa;
-#endif /* __osf__ */
+#endif /* CSRG_BASED */
    int session_flag = 0;
 
 #ifdef DT_PERFORMANCE
@@ -1031,7 +1031,7 @@ main(
    (void) signal (SIGINT, (void (*)())Stop);
 
    /* We don't want any zombie children, do we? */
-#if defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
     sa.sa_handler = sigchld_handler;
     sigemptyset(&sa.sa_mask);
     sa.sa_flags   =  0;
@@ -1041,7 +1041,7 @@ main(
         ;
 #else
    (void) signal (SIGCHLD, SIG_IGN);
-#endif /* __osf__ */
+#endif /* CSRG_BASED */
    XtSetLanguageProc( NULL, NULL, NULL );
 
 #ifdef DT_PERFORMANCE
@@ -1069,12 +1069,6 @@ _DtPerfChkpntMsgSend("Begin XtInitialize");
                             option_list, XtNumber(option_list),
                             (int *)&argc, argv);
 
-/* MERGE START: May not need
-#ifdef __osf__
-   _XmColorObjCreate ( toplevel, NULL, NULL );
-#endif
-*/
-
 #ifdef DT_PERFORMANCE
    gettimeofday(&update_time_f, NULL);
    if (update_time_s.tv_usec > update_time_f.tv_usec) {
@@ -6293,7 +6287,7 @@ FinalizeToolTalkSession();
 exit (1);
 }
 
-#if defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 extern void
 sigchld_handler(int signo)      /* Do not use the arg signo at the moment */
 {
@@ -6308,4 +6302,4 @@ sigchld_handler(int signo)      /* Do not use the arg signo at the moment */
     pid = waitpid(-1, &stat_loc, WNOHANG);
     /* Child exit handling code follows, if any */
 }
-#endif /* __osf__ */
+#endif /* CSRG_BASED */

cde/programs/dtfile/ModAttrP.c

@@ -44,7 +44,7 @@
  ****************************************************************************
  ************************************<+>*************************************/
 
-#if defined __osf__ || defined _AIX
+#if defined _AIX
 #include <stdio.h>
 #endif
   

cde/programs/dtfile/Utils.c

@@ -188,11 +188,7 @@ ResolveTranslationString( char * originalString,
   char * resolvedString = NULL;
   int    i, j, k, total, length;
 
-#ifdef __osf__
-  sprintf( addressStr, "%lx", address );
-#else
   sprintf( addressStr, "%p", address );
-#endif
 
   for( i = 0, total = 0; originalString[i] != '\0'; ++i )
     if( originalString[i] == '@' )

cde/programs/dtfile/dtcopy/sharedFuncs.c

@@ -49,11 +49,6 @@
 #  define ROOTINO UFSROOTINO
 #endif	/* SVR4 */
 
-#if defined(DEC)
-#  include <rpc/key_prot.h>
-#  define ROOTINO PROOT
-#endif
-
 #if defined(linux) || defined(CSRG_BASED)
 #  include <sys/param.h>
 #  define ROOTINO 2

cde/programs/dtfile/fsDialog.c

@@ -106,7 +106,7 @@
 #ifdef __aix
 #endif
 
-#if defined(sun) || defined(__osf__)
+#if defined(sun)
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #endif
@@ -270,17 +270,6 @@ static void getFSType(const String  path,
       strncpy(fsType,"",MAXLINELENGTH);
 #endif /* __hpux */
 
- #ifdef __osf__
-#define GETFSTYPE
-   struct statvfs buf;
-
-   strncpy(platform,"decunix",MAXLINELENGTH);
-   if (statvfs(path, &buf) == 0)
-       strncpy(fsType,buf.f_basetype,MAXLINELENGTH);
-   else
-       strncpy(fsType,"",MAXLINELENGTH);
-#endif /* DEC Unix */
-
 #ifndef GETFSTYPE
    strncpy(platform,"unknown",MAXLINELENGTH);
    strncpy(fsType,  "",MAXLINELENGTH);