Changeset 1802 for trunk/dll/newview.c

Timestamp:

Apr 5, 2015, 10:40:17 PM (10 years ago)

Author:

Gregg Young

Message:

Have newview recognize https:
as a url. Remove trailing punctuation from urls. Fix cases where ismailaddress returns TRUE in error. Fixed IP address literal case and limted domains to 3 characters in email addresses.

File:

• trunk/dll/newview.c (modified) (14 diffs)

trunk/dll/newview.c

@@ -44 +44 @@
                 containing an email. Fixed the mailto code to avoid a buffer over run (trap)
                 and to cut trailing punctuation marks from the address
+  04 Apr 15 GKY Have https:// recognized as a url. Strip trailing punctuation from urls.
 
 ***********************************************************************/
@@ -200 +201 @@
 static FATTRS Fattrs;
 
-// mailstr checks for a designated character in a string then cuts the string
-//to the first word that contains the character then prepends <mailto: and appends >
-
 BOOL isemailaddress(PSZ pszLine)
 {
   CHAR *tmp;
-  CHAR *p, *pp;
+  CHAR *p, *pp, *q;
 
   tmp = xmallocz(strlen(pszLine) + 1, pszSrcFile, __LINE__);
@@ -213 +211 @@
   memcpy(tmp, pszLine, strlen(pszLine));
   tmp[strlen(pszLine) + 1] = 0;
+  chop_at_crnl(tmp);
   bstripcr(tmp);
   p = tmp;
   p++;
-  p = strchr(p, '@');
+  q = p = strchr(p, '@');
   if (!p) {
     free(tmp);
@@ -231 +230 @@
       continue;
     else if (*p == '{') {
-      if (!strchr(p ,'}') || pp - p > 4) {
+      if (q != p - 1 || !strchr(p ,'}')) {
         free(tmp);
         return FALSE;
       }
+      else // probable IP address literal user will need to decide if it is valid
+        break;
     }
     else  {
@@ -245 +246 @@
   return TRUE;
 }
-
+// mailstr checks for a designated character in a string then cuts the string
+//to the first word that contains the character then prepends <mailto: and appends >
 PSZ mailstr(CHAR *pszSrc, CHAR *pszFindChar, LONG StrLens)
 {
@@ -317 +319 @@
       p = urld->line;
       do {
-        p = strnstr(p, "http://", e - p);
+        p = strnstr(p, "http://", e - p) ? strnstr(p, "http://", e - p) : strnstr(p, "https://", e - p);
         if (p) {
           strncpy(urld->url, p, min(e - p, SEARCHSTRINGLEN - 1));
           urld->url[min(e - p, SEARCHSTRINGLEN - 1)] = 0;
           pp = urld->url;
-          while (*pp && *pp != ' ' && *pp != '\r' && *pp != '\n' &&
+          while (*pp && *pp != ' ' && *pp != '\r' && *pp != '\n' && *pp != '\t' &&
                  *pp != '\"')
             pp++;
-          *pp = 0;
+          *pp = 0;
+          strip_trail_char(",.;:'>", urld->url);
           WinSendDlgItemMsg(hwnd, URL_LISTBOX, LM_INSERTITEM,
                             MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));
-          p++;
+         p++;
         }
       }
@@ -339 +342 @@
           urld->url[min(e - p, SEARCHSTRINGLEN - 1)] = 0;
           pp = urld->url;
-          while (*pp && *pp != ' ' && *pp != '\r' && *pp != '\n' &&
+          while (*pp && *pp != ' ' && *pp != '\r' && *pp != '\n' && *pp != '\t' &&
                  *pp != '\"')
             pp++;
-          *pp = 0;
+          *pp = 0;
+          strip_trail_char(",.;:'>", urld->url);
           WinSendDlgItemMsg(hwnd, URL_LISTBOX, LM_INSERTITEM,
-                            MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));
+                            MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));
           p++;
         }
@@ -352 +356 @@
       if (isemailaddress(p)) {
         memcpy(szUrlString, urld->line, SEARCHSTRINGLEN - 1);
-        mailstr(szUrlString, "@", e - p);
-        memcpy(urld->url, szUrlString, strlen( szUrlString) + 1);
+        mailstr(szUrlString, "@", e - p);
+        p = strrchr(szUrlString, '.');
+        memcpy(urld->url, szUrlString, (p + 4) - &szUrlString);//strlen( szUrlString) + 1);
         urld->url[strlen(szUrlString) + 1] = 0;
         if (pp = strchr(urld->url, '>'))
           *pp = 0;
         WinSendDlgItemMsg(hwnd, URL_LISTBOX, LM_INSERTITEM,
-                          MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));
+                          MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));
       }
       *urld->url = 0;
@@ -413 +418 @@
                               MPFROMP(urld->url));
             if (*urld->url) {
-              if (!strncmp(urld->url, "http://", 7)) {
+              if (!strncmp(urld->url, "http://", 7) || !strncmp(urld->url, "https://", 8)) {
                 WinDismissDlg(hwnd, 1);
                 break;
@@ -884 +889 @@
               && (!ad->markedlines
                   || !(ad->markedlines[whichline] & (VF_SELECTED | VF_FOUND)))
-              && strnstr(ad->lines[whichline], "http://",
-                         e - ad->lines[whichline])) {
+              && (strnstr(ad->lines[whichline], "http://", e - ad->lines[whichline]) ||
+             strnstr(ad->lines[whichline], "https://", e - ad->lines[whichline]))) {
             GpiSetColor(hps, standardcolors[ad->colors[COLORS_HTTPFORE]]);
             GpiSetBackColor(hps, standardcolors[ad->colors[COLORS_HTTPBACK]]);
@@ -949 +954 @@
               && (!ad->markedlines
                   || !(ad->markedlines[whichline] & (VF_SELECTED | VF_FOUND)))
-              && strnstr(ad->lines[whichline], "http://",e - ad->lines[whichline])) {
+              && (strnstr(ad->lines[whichline], "http://",e - ad->lines[whichline]) ||
+             strnstr(ad->lines[whichline], "https://",e - ad->lines[whichline]))) {
             GpiSetColor(hps, standardcolors[ad->colors[COLORS_HTTPFORE]]);
             GpiSetBackColor(hps, standardcolors[ad->colors[COLORS_HTTPBACK]]);
@@ -1441 +1447 @@
                 ad->ftpin = TRUE;
               if ((*httprun || fHttpRunWPSDefault) && !ad->ignorehttp &&
-                  strstr(ad->text, "http://"))
+                  (strstr(ad->text, "http://") || strstr(ad->text, "https://")))
                 ad->httpin = TRUE;
               if (*mailrun && !ad->ignoremail && isemailaddress(ad->text))
@@ -2499 +2505 @@
 
           if ((ad->httpin && (*httprun || fHttpRunWPSDefault) &&
-               strnstr(ad->lines[whichline], "http://", width)) ||
+               (strnstr(ad->lines[whichline], "http://", width) ||
+               strnstr(ad->lines[whichline], "https://", width))) ||
               (ad->ftpin && (*ftprun || fFtpRunWPSDefault) &&
                strnstr(ad->lines[whichline], "ftp://", width)) ||
@@ -3420 +3427 @@
       ad->httpin = FALSE;
       if (ad->text && (*httprun || fHttpRunWPSDefault) && !ad->ignorehttp &&
-          strstr(ad->text, "http://"))
+          (strstr(ad->text, "http://") || strstr(ad->text, "https://")))
         ad->httpin = TRUE;
       IgnoreHTTP = ad->ignorehttp;