projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xterm.c was absurd, no need to put trivial functions like this in a
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
9cc94a1
..
2a5cadf
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-15,6
+15,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
@@
-37,12
+41,10
@@
#include "mutt_crypt.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
#include "lib/rx.h"
#include "lib/debug.h"
+#include <wchar.h>
#include <sys/stat.h>
#include <ctype.h>
#include <unistd.h>
#include <sys/stat.h>
#include <ctype.h>
#include <unistd.h>
@@
-106,7
+108,7
@@
struct syntax_t {
};
struct line_t {
};
struct line_t {
-
LOFF_T
offset;
+
off_t
offset;
short type;
short continuation;
short chunks;
short type;
short continuation;
short chunks;
@@
-352,8
+354,8
@@
static void cleanup_quote (struct q_class_t **QuoteList)
cleanup_quote (&((*QuoteList)->down));
ptr = (*QuoteList)->next;
if ((*QuoteList)->prefix)
cleanup_quote (&((*QuoteList)->down));
ptr = (*QuoteList)->next;
if ((*QuoteList)->prefix)
-
mem_free
(&(*QuoteList)->prefix);
-
mem_free
(QuoteList);
+
p_delete
(&(*QuoteList)->prefix);
+
p_delete
(QuoteList);
*QuoteList = ptr;
}
*QuoteList = ptr;
}
@@
-374,7
+376,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
- class =
(struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)
);
+ class =
p_new(struct q_class_t, 1
);
class->color = ColorQuote[0];
*QuoteList = class;
}
class->color = ColorQuote[0];
*QuoteList = class;
}
@@
-395,10
+397,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* found shorter prefix */
if (tmp == NULL) {
/* add a node above q_list */
/* found shorter prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp =
- (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
/* replace q_list by tmp in the top level list */
tmp->length = length;
/* replace q_list by tmp in the top level list */
@@
-498,11
+498,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp = (struct q_class_t *) mem_calloc (1,
- sizeof (struct
- q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
/* replace q_list by tmp */
tmp->length = length;
/* replace q_list by tmp */
@@
-595,10
+592,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
- tmp =
- (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
if (ptr->down) {
tmp->length = length;
if (ptr->down) {
@@
-629,9
+624,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
if (class == NULL) {
/* not found so far: add it as a top level class */
if (class == NULL) {
/* not found so far: add it as a top level class */
- class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- class->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (class->prefix, qptr, length);
+ class = p_new(struct q_class_t, 1);
+ class->prefix = p_dupstr(qptr, length);
class->length = length;
new_class_color (class, q_level);
class->length = length;
new_class_color (class, q_level);
@@
-705,7
+699,7
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
-
mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&(lineInfo[n].syntax), 1
);
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
@@
-769,9
+763,7
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- mem_realloc (&(lineInfo[n].syntax),
- (lineInfo[n].chunks) *
- sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks);
}
i = lineInfo[n].chunks - 1;
pmatch[0].rm_so += offset;
}
i = lineInfo[n].chunks - 1;
pmatch[0].rm_so += offset;
@@
-853,12
+845,8
@@
static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a)
pos += 2;
}
else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) {
pos += 2;
}
else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) {
-#ifdef HAVE_COLOR
- if (a->pair != -1)
- mutt_free_color (a->fg, a->bg);
-#endif
- a->attr = ANSI_OFF;
- a->pair = -1;
+ a->bg = -2;
+ a->fg = -2;
pos += 2;
}
else if (buf[pos] == '3' && isdigit (buf[pos + 1])) {
pos += 2;
}
else if (buf[pos] == '3' && isdigit (buf[pos + 1])) {
@@
-913,7
+901,7
@@
static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
}
static int
}
static int
-fill_buffer (FILE * f,
LOFF_T *last_pos, LOFF_T
offset, unsigned char *buf,
+fill_buffer (FILE * f,
off_t *last_pos, off_t
offset, unsigned char *buf,
unsigned char *fmt, size_t blen, int *buf_ready)
{
unsigned char *p;
unsigned char *fmt, size_t blen, int *buf_ready)
{
unsigned char *p;
@@
-1135,7
+1123,7
@@
static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
*/
static int
*/
static int
-display_line (FILE * f,
LOFF_T
*last_pos, struct line_t **lineInfo, int n,
+display_line (FILE * f,
off_t
*last_pos, struct line_t **lineInfo, int n,
int *last, int *max, int flags, struct q_class_t **QuoteList,
int *q_level, int *force_redraw, regex_t * SearchRE)
{
int *last, int *max, int flags, struct q_class_t **QuoteList,
int *q_level, int *force_redraw, regex_t * SearchRE)
{
@@
-1156,12
+1144,12
@@
display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
}
if (*last == *max) {
}
if (*last == *max) {
-
mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES)
);
+
p_realloc(lineInfo, *max += LINES
);
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
- (*lineInfo)[ch].syntax =
mem_malloc (sizeof (struct syntax_t)
);
+ (*lineInfo)[ch].syntax =
p_new(struct syntax_t, 1
);
((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last =
-1;
}
((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last =
-1;
}
@@
-1233,10
+1221,9
@@
display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
- mem_realloc (&((*lineInfo)[n].search),
- ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
+ p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt);
else
else
- (*lineInfo)[n].search =
mem_malloc (sizeof (struct syntax_t)
);
+ (*lineInfo)[n].search =
p_new(struct syntax_t, 1
);
pmatch[0].rm_so += offset;
pmatch[0].rm_eo += offset;
((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first =
pmatch[0].rm_so += offset;
pmatch[0].rm_eo += offset;
((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first =
@@
-1428,7
+1415,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
int r = -1;
int redraw = REDRAW_FULL;
FILE *fp = NULL;
int r = -1;
int redraw = REDRAW_FULL;
FILE *fp = NULL;
-
LOFF_T
last_pos = 0, last_offset = 0;
+
off_t
last_pos = 0, last_offset = 0;
int old_smart_wrap, old_markers;
struct stat sb;
regex_t SearchRE;
int old_smart_wrap, old_markers;
struct stat sb;
regex_t SearchRE;
@@
-1473,12
+1460,12
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
mutt_set_flag (Context, extra->hdr, M_READ, 1);
}
mutt_set_flag (Context, extra->hdr, M_READ, 1);
}
- lineInfo =
mem_malloc (sizeof (struct line_t) * (maxLine = LINES)
);
+ lineInfo =
p_new(struct line_t, maxLine = LINES
);
for (i = 0; i < maxLine; i++) {
memset (&lineInfo[i], 0, sizeof (struct line_t));
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
for (i = 0; i < maxLine; i++) {
memset (&lineInfo[i], 0, sizeof (struct line_t));
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
- lineInfo[i].syntax =
mem_malloc (sizeof (struct syntax_t)
);
+ lineInfo[i].syntax =
p_new(struct syntax_t, 1
);
(lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1;
}
(lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1;
}
@@
-1556,7
+1543,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
-
mem_free
(&Resize);
+
p_delete
(&Resize);
}
#endif
}
#endif
@@
-1739,7
+1726,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lines++;
if (flags & M_PAGER_RETWINCH) {
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize =
mem_malloc (sizeof (struct resize)
);
+ Resize =
p_new(struct resize, 1
);
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
@@
-1757,9
+1744,9
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
-
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&lineInfo[i].syntax, 1
);
if (SearchCompiled && lineInfo[i].search)
if (SearchCompiled && lineInfo[i].search)
-
mem_free
(&(lineInfo[i].search));
+
p_delete
(&(lineInfo[i].search));
}
lastLine = 0;
}
lastLine = 0;
@@
-1935,7
+1922,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (lineInfo[i].search)
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (lineInfo[i].search)
-
mem_free
(&(lineInfo[i].search));
+
p_delete
(&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
}
lineInfo[i].search_cnt = -1;
}
}
@@
-1949,7
+1936,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
for (i = 0; i < maxLine; i++) {
/* cleanup */
if (lineInfo[i].search)
for (i = 0; i < maxLine; i++) {
/* cleanup */
if (lineInfo[i].search)
-
mem_free
(&(lineInfo[i].search));
+
p_delete
(&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
@@
-2239,9
+2226,9
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
-
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&(lineInfo[i].syntax), 1
);
if (SearchCompiled && lineInfo[i].search)
if (SearchCompiled && lineInfo[i].search)
-
mem_free
(&(lineInfo[i].search));
+
p_delete
(&(lineInfo[i].search));
}
if (SearchCompiled) {
}
if (SearchCompiled) {
@@
-2630,15
+2617,15
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
cleanup_quote (&QuoteList);
for (i = 0; i < maxLine; i++) {
cleanup_quote (&QuoteList);
for (i = 0; i < maxLine; i++) {
-
mem_free
(&(lineInfo[i].syntax));
+
p_delete
(&(lineInfo[i].syntax));
if (SearchCompiled && lineInfo[i].search)
if (SearchCompiled && lineInfo[i].search)
-
mem_free
(&(lineInfo[i].search));
+
p_delete
(&(lineInfo[i].search));
}
if (SearchCompiled) {
regfree (&SearchRE);
SearchCompiled = 0;
}
}
if (SearchCompiled) {
regfree (&SearchRE);
SearchCompiled = 0;
}
-
mem_free
(&lineInfo);
+
p_delete
(&lineInfo);
if (index)
mutt_menuDestroy (&index);
return (rc != -1 ? rc : 0);
if (index)
mutt_menuDestroy (&index);
return (rc != -1 ? rc : 0);