X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=45f33c7f381a3ad858f3b846ebae1ba2985e721c;hb=2c3b7da72126a21f05130e9ed6bb70f43624ce25;hp=e958ef37ed16feb978cfafdb44a3d82ccc2a29dc;hpb=dba36faad141d652c7b84d26295537c76fd2b5be;p=mmh diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index e958ef3..45f33c7 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -608,9 +608,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp, #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? */ @@ -648,15 +645,7 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp, unlink(linkpath); #ifdef HAVE_LSTAT if (link(altpath, linkpath) == NOTOK) { -#if 0 - /* I don't think permission on symlinks matters /JLR */ - /* PJS: else symlinks are world 'r' */ - oumask = umask(0044); -#endif symlink(altpath, linkpath); -#if 0 - umask(oumask); /* PJS: else symlinks are world 'r' */ -#endif slinked = 1; } else { slinked = 0; @@ -930,9 +919,6 @@ sendit(char *sp, char **arg, char *file, int pushed) #ifndef lint int distsw = 0; #endif -#ifdef UCI - FILE *fp; -#endif /* ** Make sure these are defined. In particular, we need @@ -1081,21 +1067,9 @@ sendit(char *sp, char **arg, char *file, int pushed) } } - if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0) + if (!(cp = getenv("SIGNATURE")) || !*cp) if ((cp = context_find("signature")) && *cp) m_putenv("SIGNATURE", cp); -#ifdef UCI - else { - snprintf(buf, sizeof(buf), "%s/.signature", mypath); - if ((fp = fopen(buf, "r")) != NULL && - fgets(buf, sizeof(buf), fp) != NULL) { - fclose(fp); - if (cp = strchr(buf, '\n')) - *cp = 0; - m_putenv("SIGNATURE", buf); - } - } -#endif /* UCI */ if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0) annotext = NULL;