LYNX-DEV Update patch for the v2.7 LYMainLoop.c

[Foteos Macrides]

        Patch for the February 15, 1997 Lynx v2.7 release to:
        
        (1) Recognize a bookmark file used as the startfile, whether it
resides in the home directory or in a subdirectory off home.  The released
code failed if the file was in home, and not in a subdirectory (unless the
-book switch was used instead of a startfile entry or WWW_HOME variable).

        (2) Correctly uncache the current directory listing when invoking
an 'u'pload, so that it will be updated to include the uploaded file if
placed in the current directory.  The released code attempted to do this
in a manner which prevented a pop, so that the directory listing couldn't
be restored on return from the uploader menu.

                                Fote

=========================================================================
 Foteos Macrides            Worcester Foundation for Biomedical Research
 address@hidden         222 Maple Avenue, Shrewsbury, MA 01545
=========================================================================

*** lynx2-7/src/LYMainLoop.c_ori        Wed Feb 12 13:15:22 1997
--- lynx2-7/src/LYMainLoop.c    Wed Feb 19 07:26:30 1997
***************
*** 516,525 ****
                            if ((cp = (char *)calloc(1,
                                  (strlen((char *)&temp[len]) + 2))) == NULL)
                                outofmem(__FILE__, "mainloop");
!                           if (temp[len] == '/')
!                               sprintf(cp, ".%s", (char *)&temp[len]);
!                           else
!                               strcpy(cp, (char *)&temp[len]);
                            for (i = 0; i <= MBM_V_MAXFILES; i++) {
                                if (MBM_A_subbookmark[i] &&
  #ifdef VMS
--- 516,530 ----
                            if ((cp = (char *)calloc(1,
                                  (strlen((char *)&temp[len]) + 2))) == NULL)
                                outofmem(__FILE__, "mainloop");
!                           if (temp[len] == '/') {
!                               if (strchr((char *)&temp[(len + 1)], '/')) {
!                                   sprintf(cp, ".%s", (char *)&temp[len]);
!                               } else {
!                                   strcpy(cp, (char *)&temp[(len + 1)]);
!                               }
!                           } else {
!                               strcpy(cp, (char *)&temp[len]);
!                           }
                            for (i = 0; i <= MBM_V_MAXFILES; i++) {
                                if (MBM_A_subbookmark[i] &&
  #ifdef VMS
***************
*** 3765,3776 ****
            if (lynx_edit_mode && !no_dired_support) {
                  LYUpload_options((char **)&newdoc.address,
                                 (char *)curdoc.address);
-               FREE(curdoc.address);   
                FREE(newdoc.post_data);
                FREE(newdoc.post_content_type);
                FREE(newdoc.bookmark);
                newdoc.isHEAD = FALSE;
                newdoc.safe = FALSE;
             }
            break;
  #endif /* DIRED_SUPPORT */
--- 3770,3786 ----
            if (lynx_edit_mode && !no_dired_support) {
                  LYUpload_options((char **)&newdoc.address,
                                 (char *)curdoc.address);
                FREE(newdoc.post_data);
                FREE(newdoc.post_content_type);
                FREE(newdoc.bookmark);
                newdoc.isHEAD = FALSE;
                newdoc.safe = FALSE;
+               /*
+                *  Uncache the current listing so that it will
+                *  be updated to included the uploaded file if
+                *  placed in the current directory. - FM
+                */
+               HTuncache_current_document();
             }
            break;
  #endif /* DIRED_SUPPORT */
;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;