projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
c1b09be
..
21425a5
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-200,7
+200,7
@@
void *safe_malloc(size_t n) {
void *p = malloc(n);
if(!p && n != 0) {
fprintf(stderr,
void *p = malloc(n);
if(!p && n != 0) {
fprintf(stderr,
- "
selector
: cannot allocate memory: %s\n", strerror(errno));
+ "
mymail
: cannot allocate memory: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
return p;
exit(EXIT_FAILURE);
}
return p;
@@
-212,8
+212,9
@@
FILE *safe_fopen(const char *path, const char *mode, const char *comment) {
return result;
} else {
fprintf(stderr,
return result;
} else {
fprintf(stderr,
- "mymail: Cannot open file '%s' (%s) with mode \"%s\".\n",
- path, comment, mode);
+ "mymail: Cannot open file '%s' (%s) with mode \"%s\": %s\n",
+ path, comment, mode,
+ strerror(errno));
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-505,6
+506,12
@@
int search_in_db(const char *db_filename,
while(nb_extracted_mails < global_nb_mails_max &&
fgets(raw_db_line, BUFFER_SIZE, db_file)) {
while(nb_extracted_mails < global_nb_mails_max &&
fgets(raw_db_line, BUFFER_SIZE, db_file)) {
+
+ /* Removes the CR */
+ char *s = raw_db_line;
+ while(*s && *s != '\n') { s++; }
+ *s = '\0';
+
db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
if(strcmp("mail", db_key_string) == 0) {
db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
if(strcmp("mail", db_key_string) == 0) {
@@
-520,7
+527,7
@@
int search_in_db(const char *db_filename,
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
db_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', db_value);
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
db_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', db_value);
-
db_value = parse_token(current_mail_filename, PATH_MAX+1, '\n', db_value
);
+
strncpy(current_mail_filename, db_value, PATH_MAX + 1
);
current_position_in_mail = atol(position_in_file_string);
}
current_position_in_mail = atol(position_in_file_string);
}
@@
-1145,6
+1152,16
@@
int main(int argc, char **argv) {
}
}
}
}
+ if(error) {
+ print_usage(stderr);
+ exit(EXIT_FAILURE);
+ }
+
+ if(show_help) {
+ print_usage(stdout);
+ exit(EXIT_SUCCESS);
+ }
+
/* Set all the values that may defined in the arguments, through
environment variables, or hard-coded */
/* Set all the values that may defined in the arguments, through
environment variables, or hard-coded */
@@
-1168,18
+1185,6
@@
int main(int argc, char **argv) {
"MYMAIL_MBOX_PATTERN",
0);
"MYMAIL_MBOX_PATTERN",
0);
- /* Start the processing */
-
- if(error) {
- print_usage(stderr);
- exit(EXIT_FAILURE);
- }
-
- if(show_help) {
- print_usage(stdout);
- exit(EXIT_SUCCESS);
- }
-
/* mbox indexing */
if(action_index) {
/* mbox indexing */
if(action_index) {