* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
****************************************************************************
************************************<+>*************************************/
-#if defined(SVR4) || defined(sco)
-# if defined(USL) || defined(sco) || defined(__uxp__)
-# include <sys/param.h>
-# include <sys/types.h>
-# endif
-# ifdef sco
-# include <sys/fs/s5param.h>
-# define ROOTINO S5ROOTINO
-# else
+#if defined(SVR4)
# include <sys/fs/ufs_fs.h>
# define ROOTINO UFSROOTINO
-# endif /* sco */
#else
-# if defined(linux) || defined(CSRG_BASED)
+# if defined(__linux__) || defined(CSRG_BASED)
# define ROOTINO 2
# endif
# include <sys/param.h>
-#endif /* SVR4 || sco */
+#endif /* SVR4 */
#include <sys/types.h>
#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>
#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>
#include <Dt/DtP.h> /* required for DtDirPaths type */
#include <Dt/Connect.h>
#include <Dt/DtNlUtils.h>
+#include <Dt/SharedProcs.h>
#include "Encaps.h"
#include "SharedProcs.h"
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);
return access_priv;
#endif /* BLS */
-#endif /* Apollo & OSF */
+#endif /* Apollo */
}
/* pass in geometry, and other command lines params when available */
if(type == TRASH_DIRECTORY)
rc = execlp(DTCOPY, "dtfile_copy", "-move", "-confirmReplace",
- "-confirmErrors", "-popDown","-checkPerms", source, target, 0);
+ "-confirmErrors", "-popDown","-checkPerms", source, target, NULL);
else
rc = execlp(DTCOPY, "dtfile_copy", "-move", "-confirmReplace",
- "-confirmErrors", "-popDown", source, target, 0);
+ "-confirmErrors", "-popDown", source, target, NULL);
/* call errorhandler */
perror ("Could not exec child process \"dtfile_copy\"");
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 */
#else
-#if defined(SVR4) || defined(_AIX) || defined(sco)
+#if defined(SVR4) || defined(_AIX)
((s3.st_mode & S_IFMT) == S_IFDIR) ) /* if is a directory */
#else /* (__hpux) */
(((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */
break;
}
- /* If catmsg is NULL then one of the miscellanous error's occured.
+ /* If catmsg is NULL then one of the miscellanous error's occurred.
* Set up a generic error message which will output the internal
* error message.
*/
else
tmpStr = (GETMESSAGE(11,54, "The move of the file/folder failed\ndue to some internal error. The internal\nerror given is:"));
catmsg = XtNewString(tmpStr);
- tmpStr = (GETMESSAGE(11,55, "Please see your System Adminstrator"));
+ tmpStr = (GETMESSAGE(11,55, "Please see your System Administrator"));
samsg = XtNewString(tmpStr);
}