libmemo/messaging.h
@@ -26,6 +26,7 @@
#include "messages.h"
#include "xmalloc.h"
#include "macros.h"
+#include "messaging.h"
#define REPLY_PARSE_SCRIPT LIBDIR"/parse-reply.pl"
#define failed(x) die("%s failed at %s:%i\n", x, __FILE__, __LINE__)
@@ -36,13 +37,11 @@ memo_send_test(memo_database *db, unsigned words, const char *email) {
}
/*
- * TODO: split this function into smaller ones. It's huge.
- * A general refactoring would also be welcome.
+ * TODO: A general refactoring would be welcome.
*/
int
memo_check_reply(FILE *reply, memo_database *db, char **report) {
int input[2], output[2], pid;
- char buf[50];
if (pipe(input) || pipe(output))
failed("pipe");
if ((pid = fork()) < 0) {
@@ -60,55 +59,65 @@ memo_check_reply(FILE *reply, memo_database *db, char **report) {
} else {
/* We're the parent. */
int status;
- FILE *parsed;
if (close(input[0]) || close(output[1]))
failed("close");
- while (!feof(reply)) {
- int count;
- count = fread(buf, sizeof(char), ARRAY_SIZE(buf), reply);
- if (count < 1)
- continue;
- if (write(input[1], buf, count) < 1)
- die("write");
- }
- if (close(input[1]))
- failed("close");
+ send_data_to_checking_script(reply, input[1]);
if (wait(&status) < 0) {
perror("wait");
failed("wait");
}
- if ((parsed = fdopen(output[0],"r")) == NULL)
- failed("fdopen");
- while (!feof(parsed)) {
- /* TODO: That's not a very portable way of reading lines. */
- int count, match;
- static int qn = 0, an = 0;
- static char *question = NULL, *answer = NULL;
- memo_word *question_word, *answer_word;
- count = getline(&question, &qn, parsed);
- if (count < 1)
- continue;
- question[count-1] = '\0';
- count = getline(&answer, &an, parsed);
- if (count < 1)
- continue;
- answer[count-1] = '\0';
- question_word = memo_database_find_word_by_value(db, question);
+ read_data_from_checking_script(output[0], db);
+ }
+ return 0;
+}
+
+void
+send_data_to_checking_script(FILE *data, int fd) {
+ char buf[50];
+ while (!feof(data)) {
+ int count;
+ count = fread(buf, sizeof(char), ARRAY_SIZE(buf), data);
+ if (count < 1)
+ continue;
+ if (write(fd, buf, count) < 1)
+ die("write");
+ }
+ if (close(fd))
+ failed("close");
+}
+
+void
+read_data_from_checking_script(int fd, memo_database *db) {
+ FILE *parsed;
+ if ((parsed = fdopen(fd, "r")) == NULL)
+ failed("fdopen");
+ while (!feof(parsed)) {
+ /* TODO: That's not a very portable way of reading lines. */
+ int count, match;
+ static int qn = 0, an = 0;
+ static char *question = NULL, *answer = NULL;
+ memo_word *question_word, *answer_word;
+ count = getline(&question, &qn, parsed);
+ if (count < 1)
+ continue;
+ question[count-1] = '\0';
+ count = getline(&answer, &an, parsed);
+ if (count < 1)
+ continue;
+ answer[count-1] = '\0';
+ question_word = memo_database_find_word_by_value(db, question);
+ if (question_word) {
answer_word = memo_database_find_word_by_value(db, answer);
- if (question_word) {
- if (answer_word && memo_word_check_translation(question_word,
- answer_word) == 0) {
- memo_word_inc_positive_answers(question_word);
- } else {
- memo_word_inc_negative_answers(question_word);
- }
- memo_word_update(question_word);
+ if (answer_word && memo_word_check_translation(question_word,
+ answer_word) == 0) {
+ memo_word_inc_positive_answers(question_word);
+ } else {
+ memo_word_inc_negative_answers(question_word);
}
- if (question_word)
- memo_word_free(question_word);
+ memo_word_update(question_word);
+ memo_word_free(question_word);
if (answer_word)
memo_word_free(answer_word);
}
}
- return 0;
}
libmemo/messaging.c
b09759ececef9dc02698487692dc97106cdb1f21
Jan Stępień
jstepien
jstepien@users.sourceforge.net
http://github.com/jstepien/memo/commit/6d20c3b1cc7646f53ab759dfef5a1cca158af290
6d20c3b1cc7646f53ab759dfef5a1cca158af290
2009-02-19T13:51:00-08:00
2009-02-19T13:51:00-08:00
Refactoring in libmemo/messaging.c.
94a806b6b90d1a476eeaf6877c2e5963c8aa5c1a
Jan Stępień
jstepien
jstepien@users.sourceforge.net