• Patch: Elm ME+ 2.5 PLalpha49 -> Elm ME+ 2.5 PLalpha50 [3/7] (4/4)

    From Kari Hurtta@21:1/5 to All on Mon Jun 10 20:53:28 2019
    [continued from previous message]

    + int *newmails;
    {
    ! enum copy_env_end_status status;

    if (FOLDER_INFO_magic != folder->magic)
    panic("MBX PANIC",__FILE__,__LINE__,"copy_envelope_end", ***************
    *** 1767,1788 ****
    panic("MBX PANIC",__FILE__,__LINE__,"copy_envelope_end_folder",
    "Bad magic number (read state)",0);

    DPRINT(Debug,10,(&Debug,
    "copy_envelope_end_folder: folder=%p (%s), type=%p (%s)\n",
    folder,folder->cur_folder_sys,folder -> folder_type,
    folder->folder_type->type_name));

    ! ret=folder->folder_type->copy_envelope_end_it(folder,read_state_ptr);

    ! if (ret) {
    /* 0 == reading, 1 = skipping, -1 == end of message */
    read_state_ptr ->skipping = sm_EOM;
    }

    DPRINT(Debug,10,(&Debug,
    ! "copy_envelope_end_folder=%d\n",
    ! ret));
    ! return ret;
    }

    int copy_envelope_reset_body(folder,read_state_ptr,content_remaining)
    --- 3569,3673 ----
    panic("MBX PANIC",__FILE__,__LINE__,"copy_envelope_end_folder",
    "Bad magic number (read state)",0);

    + if (newbytes)
    + *newbytes = 0;
    + if (newmails)
    + *newmails = 0;
    +
    DPRINT(Debug,10,(&Debug,
    "copy_envelope_end_folder: folder=%p (%s), type=%p (%s)\n",
    folder,folder->cur_folder_sys,folder -> folder_type,
    folder->folder_type->type_name));

    ! if (read_state_ptr -> reconnect_copy_previous) {
    ! RECONNECT_MODE reconnect_mode;
    ! struct FILE_rs * rs;
    !
    ! char *buffer1 = NULL;
    ! int len1;
    !
    ! DPRINT(Debug,50,(&Debug,
    ! "copy_envelope_end_folder: Using previous temp for copy_previous_mail()\n"));
    !
    ! if (CPPREV_RS_magic !=
    ! read_state_ptr -> reconnect_copy_previous -> magic)
    ! panic("MBX PANIC",__FILE__,__LINE__,"copy_envelope_end_folder",
    ! "Bad magic number (copy_previous_rs)",0);
    !
    ! reconnect_mode =
    ! read_state_ptr -> reconnect_copy_previous -> reconnect_mode_