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

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

    panic("URL PANIC",__FILE__,__LINE__,"dump_aliases_map",
    "Bad magic number",0);
    !
    if (!fileset) {
    DPRINT(Debug,10,(&Debug,
    "dump_aliases_map: File charset is not set, using system charset\n"));
    ***************
    *** 880,889 ****

    insert_commentfile(f,ELMALIASES_INFO,commentfile,
    actor,version_buff);

    ! for (i = 0; i < map->vector_len; i++) {
    ! struct aliases_map_node * node = map->vector[i];
    ! char * s1 = NULL;

    if (!node)
    continue;
    --- 1932,1955 ----

    insert_commentfile(f,ELMALIASES_INFO,commentfile,
    actor,version_buff);
    +
    + /* Dump on sort list order !!! */
    +
    + len = sort_list_len(map->root);

    ! for (i = 0; i < len; i++) {
    !
    ! union sort_item item;
    ! struct aliases_map_node * node = NULL;
    !
    ! item.aliases = NULL;
    !
    ! /* increments refcount */
    ! get_sort_list_item(map->root,sort_list_get_normal,i,
    ! &item);
    !
    !
    ! node = item.aliases;

    if (!node)
    continue;
    ***************
    *** 891,911 ****
    if (node->magic != ALIASES_node_magic)
    panic("ALIASES PANIC",__FILE__,__LINE__,"dump_aliases_map",
    "Bad node magic number",0);
    -
    - if (i != node->idx)
    - panic("URL PANIC",__FILE__,__LINE__,"dump_aliases_map",
    - "Bad node index number",0);

    !
    ! s1 = string_to_hdr(HDR_PHRASE,
    ! node->alias_name,
    ! fileset, need_mime_encoding(node->alias_name,fileset),
    ! NULL,1);
    !
    ! fprintf(f,"%s\t%s\n",ALIAS_TOKEN,s1);