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

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

    "mbx_zero_rs_fields_file: rs=%p\n",
    rs));

    ! zero_FILE_rs(& (rs -> a.file));
    ! }
    !
    ! void clear_FILE_rs(rs)
    ! struct FILE_rs *rs;
    ! {
    ! DPRINT(Debug,12,(&Debug, "clear_FILE_rs: rs=%p\n",
    ! rs));
    !
    ! if (rs -> next_line) {
    ! DPRINT(Debug,50,(&Debug, "clear_FILE_rs: next_line="));
    !
    ! DEBUG_PRINT_BUFFER(Debug,50,rs -> next_line_len,
    ! s2us(rs -> next_line));
    !
    ! if (rs -> next_line_len < 1 || ! (rs -> next_line) ||
    ! (rs -> next_line)[rs -> next_line_len -1] != '\n') {
    ! DPRINT(Debug,50,(&Debug, "\nclear_FILE_rs: NO NEWLINE\n"));
    ! }
    !
    ! free(rs -> next_line);
    ! rs -> next_line = NULL;
    ! }
    ! rs -> next_line_len = 0;
    }

    + S_(mbx_free_rs_fields_folder mbx_free_rs_fields_file)
    static void mbx_free_rs_fields_file P_((struct read_folder_state *rs));
    static void mbx_free_rs_fields_file(rs)
    struct read_folder_state *rs;
    ***************
    *** 5353,5363 ****
    "mbx_free_rs_fields_file: rs=%p\n",
    rs));

    ! if (rs -> a.file.next_line) {
    ! free(rs -> a.file.next_line);
    ! rs -> a.file.next_line = NULL;
    ! }
    ! rs -> a.file.next_line_len = 0;
    }

    static int mbx_prepare_seek_folder P_((struct folder_info *folder,
    --- 5643,5649 ----
    "mbx_free_rs_fields_file: rs=%p\n",
    rs));

    ! clear_FILE_rs(& (rs -> a.file));
    }

    static int mbx_prepare_seek_folder P_((struct folder_info *folder, ***************
    *** 5376,5403 ****
    "Bad magic number (private_data)",0);

    if (add_new_only) {
    ! if (fseek(folder->p->fh_folder,
    ! folder->mailfile_size, SEEK_SET) == -1) {
    int err = errno;
    lib_error(CATGETS(elm_msg_cat, ElmSet, ElmCouldntSeekEndFolder,
    ! "Couldn't seek to %ld (end of folder) in %S: %s"),
    folder-> mailfile_size,
    folder-> cur_folder_disp,
    strerror(err));
    ! DPRINT(Debug,1,(&Debug,
    ! "Error: Couldn't seek to end of folder %s: (offset %ld) Errno %s (%s)\n",
    ! folder -> cur_folder_sys,
    ! folder -> mailfile_size,
    ! strerror(err),
    ! "mbx_prepare_seek_folder"));
    ! status = 0;
    ! goto clean;
    }
    /* read_state_ptr->count = message_count; */ /* next available */