Revert "dtfile: coverity CIDs 88363,88405,89140,89612; insecure readlink"

This reverts commit 7fa35c29c4559ce8b4ca4d4b5f0216a5305bb6ea.

diff --git a/cde/programs/dtfile/Directory.c b/cde/programs/dtfile/Directory.c
index f8ed2fb47fefa8681530d1364b996e9e9f875788..578e92660a4c163f71b21cbb86240c483e2135c8 100644 (file)
--- a/cde/programs/dtfile/Directory.c
+++ b/cde/programs/dtfile/Directory.c
@@ -825,7 +825,7 @@ ReadFileData(
    {
      while ((link_len = readlink(link_file_name, link_path, MAX_PATH)) > 0)
      {
-       link_path[link_len-1] = 0;
+       link_path[link_len] = '\0';
        link_list = (char **)XtRealloc((char *)link_list, sizeof(char *) *
                                       (link_count + 2));
 
@@ -1071,7 +1071,7 @@ ReadFileData2(
    {
      while ((link_len = readlink(link_file_name, link_path, MAX_PATH)) > 0)
      {
-       link_path[link_len - 1] = 0;
+       link_path[link_len] = NILL;
        link_list = (char **)XtRealloc((char *)link_list, sizeof(char *) *
                                       (link_count + 2));
 

diff --git a/cde/programs/dtfile/SharedProcs.c b/cde/programs/dtfile/SharedProcs.c
index eadcc2f97af06cecb7b1909971bc74983829d30b..48a21aff5a8f8ace222e3766d4e2bf82da0e05c4 100644 (file)
--- a/cde/programs/dtfile/SharedProcs.c
+++ b/cde/programs/dtfile/SharedProcs.c
@@ -236,7 +236,7 @@ _DtFollowLink (
 
    while ((link_len = readlink(file, link_path, MAXPATHLEN)) > 0)
    {
-      link_path[link_len-1] = 0;
+      link_path[link_len] = '\0';
 
       /* Force the link to be an absolute path, if necessary */
       if (link_path[0] != '/')

diff --git a/cde/programs/dtfile/dtcopy/fsrtns.c b/cde/programs/dtfile/dtcopy/fsrtns.c
index 4956d5aed2f82e9216b41867dfeb2ad45261c3c9..5532aca2a2dc028713f633b6ac515ac708ef6aa2 100644 (file)
--- a/cde/programs/dtfile/dtcopy/fsrtns.c
+++ b/cde/programs/dtfile/dtcopy/fsrtns.c
@@ -187,7 +187,7 @@ CopyLink(char *sourceP, char *targetP, int repl, struct stat *statP)
   } while (l < 0 && errno == EINTR);
   if (l < 0)
     return errno;
-  buf[l-1] = 0;
+  buf[l] = 0;
   if (symlink(buf, targetP) == 0)
     return 0;
   else if (errno != EEXIST || !repl)