1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
diff -ur slrn-0.9.7.3.orig/doc/slrn.rc slrn-0.9.7.3/doc/slrn.rc
--- slrn-0.9.7.3.orig/doc/slrn.rc Sat Nov 3 16:13:26 2001
+++ slrn-0.9.7.3/doc/slrn.rc Sat Jan 12 01:37:32 2002
@@ -220,6 +220,11 @@
% display all the "X-"headers except "X-Trace:").
%visible_headers "From:,Subject:,Newsgroups:,Followup-To:,Reply-To:"
+% If non-zero, visible headers are displayed in specific order.
+% If 1, headers are arranged with respect to visible_headers order put above,
+% If 2, the same as above with multiple matches sorted alphabetically.
+%set visible_headers_sorting_method 2
+
% If non-zero, #v+ and #v- will be interpreted as markers of verbatim lines.
%set process_verbatim_marks 1
diff -ur slrn-0.9.7.3.orig/src/art.h slrn-0.9.7.3/src/art.h
--- slrn-0.9.7.3.orig/src/art.h Sat Nov 3 16:15:54 2001
+++ slrn-0.9.7.3/src/art.h Sat Jan 12 01:35:07 2002
@@ -47,6 +47,7 @@
extern int Slrn_Auto_CC_To_Poster;
extern int Slrn_Score_After_XOver;
extern int Slrn_Use_Tmpdir;
+extern int Slrn_Visible_Headers_Sorting_Mode;
extern int Slrn_Wrap_Mode;
extern int Slrn_Wrap_Method;
extern int Slrn_Use_Header_Numbers;
diff -ur slrn-0.9.7.3.orig/src/art_misc.c slrn-0.9.7.3/src/art_misc.c
--- slrn-0.9.7.3.orig/src/art_misc.c Sat Nov 3 16:15:53 2001
+++ slrn-0.9.7.3/src/art_misc.c Sat Jan 12 01:35:07 2002
@@ -65,6 +65,8 @@
static char *Super_Cite_Regexp = "^[^A-Za-z0-9]*\"\\([-_a-zA-Z/]+\\)\" == .+";
+int Slrn_Visible_Headers_Sorting_Mode = 2;
+
static void hide_article_lines (Slrn_Article_Type *a, unsigned int mask) /*{{{*/
{
Slrn_Article_Line_Type *l;
@@ -908,6 +910,157 @@
/*}}}*/
+void _slrn_sort_visible_headers (Slrn_Article_Type *a) /*{{{*/
+{
+ Slrn_Article_Line_Type *l, *lnext, *sorted, *sorted_last;
+ Slrn_Article_Line_Type *sorted_headers, *sorted_headers_last;
+ Visible_Header_Type *sortpos, *sortpos_better;
+ int is_better_match, sort_again;
+ char *colon, *colon_next;
+
+ if (Slrn_Visible_Headers_Sorting_Mode < 1) return;
+
+ sorted_headers = NULL;
+ sorted_headers_last = NULL;
+ sortpos = Visible_Headers;
+
+ while (sortpos != NULL)
+ {
+ l = a->lines;
+ sorted = NULL;
+ sorted_last = NULL;
+
+ while ((l != NULL) && (l->flags & HEADER_LINE))
+ {
+ lnext = l->next;
+ if (0 == slrn_case_strncmp ((unsigned char *)l->buf,
+ (unsigned char *)sortpos->header,
+ sortpos->len))
+ {
+ sortpos_better = sortpos->next;
+ is_better_match = 0;
+ while ((sortpos_better != NULL) && (is_better_match == 0))
+ {
+ if (0 == slrn_case_strncmp ((unsigned char *)l->buf,
+ (unsigned char *)sortpos_better->header,
+ sortpos_better->len))
+ {
+ if (sortpos_better->len >= sortpos->len)
+ is_better_match = 1;
+ }
+ sortpos_better = sortpos_better->next;
+ }
+
+ if (is_better_match == 0)
+ {
+ if (l->prev != NULL)
+ l->prev->next = l->next;
+ else
+ a->lines = l->next;
+
+ if (l->next != NULL)
+ l->next->prev = l->prev;
+
+ if (sorted == NULL)
+ sorted = l;
+ else
+ {
+ sorted_last->next = l;
+ l->prev = sorted_last;
+ }
+ sorted_last = l;
+ }
+ }
+ l = lnext;
+ }
+
+ if (Slrn_Visible_Headers_Sorting_Mode > 1)
+ {
+ if (sorted != sorted_last)
+ {
+ sort_again = 1;
+ while (sort_again)
+ {
+ sort_again = 0;
+ sorted->prev = NULL;
+ sorted_last->next = NULL;
+ l = sorted;
+ while (l != sorted_last)
+ {
+ lnext = l->next;
+
+ colon = slrn_strchr (l->buf, ':');
+ if (colon != NULL)
+ *colon = 0;
+
+ colon_next = slrn_strchr (lnext->buf, ':');
+ if (colon_next != NULL)
+ *colon_next = 0;
+
+ if (0 < slrn_case_strcmp ((unsigned char *)l->buf,
+ (unsigned char *)lnext->buf))
+ {
+ sort_again = 1;
+ if (l->prev != NULL)
+ l->prev->next = lnext;
+ else
+ sorted = lnext;
+
+ lnext->prev = l->prev;
+ l->prev = lnext;
+ l->next = lnext->next;
+ lnext->next = l;
+ if (l->next != NULL)
+ l->next->prev = l;
+ else
+ sorted_last = l;
+
+ lnext = l;
+ }
+
+ if (colon != NULL)
+ *colon = ':';
+
+ if (colon_next != NULL)
+ *colon_next = ':';
+
+ l = lnext;
+ }
+ }
+ }
+ }
+
+ if (sorted != NULL)
+ {
+ if (sorted_headers == NULL)
+ {
+ sorted_headers = sorted;
+ sorted_headers_last = sorted_last;
+ }
+ else
+ {
+ sorted_headers->prev = sorted_last;
+ sorted_last->next = sorted_headers;
+ sorted_headers = sorted;
+ }
+ }
+ sortpos = sortpos->next;
+ }
+
+ if (sorted_headers != NULL)
+ {
+ sorted_headers_last->next = a->lines;
+ a->lines->prev = sorted_headers_last;
+ a->lines = sorted_headers;
+ a->cline = sorted_headers;
+ sorted_headers->prev = NULL;
+ }
+
+ return;
+}
+
+/*}}}*/
+
int _slrn_art_unfold_header_lines (Slrn_Article_Type *a) /*{{{*/
{
Slrn_Article_Line_Type *l;
@@ -952,6 +1105,9 @@
l = l->next;
}
+
+ _slrn_sort_visible_headers (a);
+
return 0;
}
diff -ur slrn-0.9.7.3.orig/src/startup.c slrn-0.9.7.3/src/startup.c
--- slrn-0.9.7.3.orig/src/startup.c Sat Nov 3 16:15:46 2001
+++ slrn-0.9.7.3/src/startup.c Sat Jan 12 01:35:07 2002
@@ -520,6 +520,7 @@
{"cc_followup", &Slrn_Auto_CC_To_Poster},
{"use_tmpdir", &Slrn_Use_Tmpdir},
{"sorting_method", &Slrn_Sorting_Mode},
+ {"visible_headers_sorting_method", &Slrn_Visible_Headers_Sorting_Mode},
{"custom_sort_by_threads", &Slrn_Sort_By_Threads},
{"uncollapse_threads", &Slrn_Threads_Visible},
{"read_active", &Slrn_List_Active_File},
|
