Removed some unused code having to do with permissions of symlinks.

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4dcdc387c20d559b5dd24f74512e368cc5ebcb11..90d17fa2df2b502d99cb319c4d4f52b1758cbb42 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -16,7 +16,6 @@ extern char *mhlibdir;
 extern char *mhetcdir;
 
 char *sbackup = BACKUP_PREFIX;
 extern char *mhetcdir;
 
 char *sbackup = BACKUP_PREFIX;

-char *slink = LINK;

 
 static struct swit switches[] = {
 #define        COMPSW    0
 
 static struct swit switches[] = {
 #define        COMPSW    0


@@ -68,7 +67,6 @@ static struct proc procs [] = {
      { "etcdir",        &mhetcdir },
      { "libdir",        &mhlibdir },
      { "sbackup",       &sbackup },
      { "etcdir",        &mhetcdir },
      { "libdir",        &mhlibdir },
      { "sbackup",       &sbackup },

-     { "link",          &slink },

      { NULL,            NULL },
 };
 
      { NULL,            NULL },
 };
 

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index d23d141d88f967a722a06284023ab68558127268..7b637628b374a26969cfd1a0e6a46df049f68a55 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -642,9 +642,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 #ifdef HAVE_LSTAT
     int        slinked = 0;
 
 #ifdef HAVE_LSTAT
     int        slinked = 0;

-#if 0
-    int oumask;        /* PJS: for setting permissions on symlinks. */
-#endif

 #endif /* HAVE_LSTAT */
 
     /* Was there a previous edit session? */
 #endif /* HAVE_LSTAT */
 
     /* Was there a previous edit session? */


@@ -674,20 +671,11 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            strncpy (linkpath, LINK, sizeof(linkpath));
        else
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
            strncpy (linkpath, LINK, sizeof(linkpath));
        else
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);

-    }

 
 

-    if (altmsg) {

        unlink (linkpath);
 #ifdef HAVE_LSTAT
        if (link (altpath, linkpath) == NOTOK) {
        unlink (linkpath);
 #ifdef HAVE_LSTAT
        if (link (altpath, linkpath) == NOTOK) {

-#if 0
-           /* I don't think permission on symlinks matters /JLR */
-           oumask = umask(0044);       /* PJS: else symlinks are world 'r' */
-#endif

            symlink (altpath, linkpath);
            symlink (altpath, linkpath);

-#if 0
-           umask(oumask);              /* PJS: else symlinks are world 'r' */
-#endif

            slinked = 1;
        } else {
            slinked = 0;
            slinked = 1;
        } else {
            slinked = 0;