• Patch: Elm ME+ 2.5 PLalpha54 -> Elm ME+ 2.5 PLalpha60 [3/13] (3/4)

    From Kari Hurtta@21:1/5 to All on Thu Nov 24 20:24:49 2022
    [continued from previous message]

    }
    !
    free_string(&comment);

    } else if (0 == strcmp(buf,FIRSTNAME_TOKEN)) {

    - struct string * err = NULL;
    -
    /* Allow mime encoding used on here .... */
    struct string * firstname = hdr_to_string(HDR_PHRASE,ptr,cs,1);

    ! address_alias_add_firstname(& current_node->alias, firstname, &err);

    ! if (err) {
    ! lib_error(CATGETS(elm_msg_cat, MeSet, MeAliasErrorNo,
    ! "%s: %d: %S: %s: %.100s..."),
    ! filename,lineno,err,buf,ptr);

    - (*errors) ++;
    - free_string(&err);
    }

    free_string(&firstname);

    } else if (0 == strcmp(buf,LASTNAME_TOKEN)) {

    - struct string * err = NULL;
    -
    /* Allow mime encoding used on here .... */
    struct string * lastname = hdr_to_string(HDR_PHRASE,ptr,cs,1);

    ! address_alias_add_lastname(& current_node->alias, lastname, &err); !
    ! if (err) {
    ! lib_error(CATGETS(elm_msg_cat, MeSet, MeAliasErrorNo,
    ! "%s: %d: %S: %s: %.100s..."),
    ! filename,lineno,err,buf,ptr);

    - (*errors) ++;
    - free_string(&err);
    }
    !
    free_string(&lastname);

    -
    } else if (0 == strcmp(buf,ADDRESS_TOKEN)) {

    - struct string * err = NULL;
    -
    /* Allow mime encoding used on here .... */
    struct address * addr = parse_one_address(ptr,1,cs);
    !
    if (!addr) {
    lib_error(CATGETS(elm_msg_cat, MeSet, MeAliasAddressErrorNo,
    "%s: %d: Failed to parse address: %s: %s"), --- 848,929 ----
    }

    if (0 == strcmp(buf,COMMENT_TOKEN)) {
    !
    /* Allow mime encoding used on here .... */
    struct string * comment = hdr_to_string(HDR_PHRASE,ptr,cs,1);

    ! if (! current_node->changed) {
    !
    ! struct string * err = NULL;
    !
    ! address_alias_add_comment(& current_node->alias, comment, &err);
    !
    ! if (err) {
    ! lib_error(CATGETS(elm_msg_cat, MeSet, MeAliasErrorNo,
    ! "%s: %d: %S: %s: %.100s..."),
    ! filename,lineno,errno,err,buf,ptr);
    !
    ! (*errors) ++;
    ! free_string(&err);
    ! }

    }
    !
    free_string(&comment);

    } else if (0 == strcmp(buf,FIRSTNAME_TOKEN)) {

    /* Allow mime encoding used on here .... */
    struct string * firstname = hdr_to_string(HDR_PHRASE,ptr,cs,1);

    ! if (! current_node->changed) {

    ! struct string * err = NULL;
    !
    ! address_alias_add_firstname(& current_node->alias, firstname, &err);
    !
    ! if (err) {
    ! lib_error(CATG