chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ijackson'
[ypp-sc-tools.db-test.git]
/
pctb
/
convert.c
diff --git
a/pctb/convert.c
b/pctb/convert.c
index 9fcbd58483fb08587a040fd25cd33c4aecdec571..e6e0102e6b02b69fb7031d52de2a43a80dc03e18 100644
(file)
--- a/
pctb/convert.c
+++ b/
pctb/convert.c
@@
-110,33
+110,40
@@
static void run_analysis(void) {
EXECLP_HELPER("commod-results-processor", o_outmode_str, (char*)0);
}
EXECLP_HELPER("commod-results-processor", o_outmode_str, (char*)0);
}
- waitpid_check_exitstatus(processor, "output processor/uploader");
+ waitpid_check_exitstatus(processor, "output processor/uploader"
, 0
);
fclose(tf);
progress_log("all complete.");
}
fclose(tf);
progress_log("all complete.");
}
-void fetch_with_rsync(const char *stem) {
+static void rsync_core(const char *stem, const char *suffix,
+ const char *zopt) {
pid_t fetcher;
pid_t fetcher;
+ progress("Updating dictionary %s...",stem);
+
sysassert( (fetcher= fork()) != -1 );
if (!fetcher) {
const char *rsync= getenv("YPPSC_PCTB_RSYNC");
if (!rsync) rsync= "rsync";
const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
sysassert( (fetcher= fork()) != -1 );
if (!fetcher) {
const char *rsync= getenv("YPPSC_PCTB_RSYNC");
if (!rsync) rsync= "rsync";
const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
- char *remote= masprintf("%s/master-%s.txt
", src, stem
);
- char *local= masprintf("_master-%s.txt
", stem
);
+ char *remote= masprintf("%s/master-%s.txt
%s", src, stem, suffix
);
+ char *local= masprintf("_master-%s.txt
%s", stem, suffix
);
if (DEBUGP(rsync))
fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
if (DEBUGP(rsync))
fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
- execlp(rsync, "rsync",
- DEBUGP(rsync) ? "-zvLt" : "-zLt",
- "--",remote,local,(char*)0);
+ char *opts= masprintf("-Lt%s%s",
+ zopt,
+ DEBUGP(rsync) ? "v" : "");
+ execlp(rsync, "rsync",opts,"--",remote,local,(char*)0);
sysassert(!"exec rsync failed");
}
sysassert(!"exec rsync failed");
}
- waitpid_check_exitstatus(fetcher, "rsync");
+ waitpid_check_exitstatus(fetcher, "rsync"
, 0
);
}
}
+void fetch_with_rsync_gz(const char *stem) { rsync_core(stem,".gz",""); }
+void fetch_with_rsync(const char *stem) { rsync_core(stem,"","z"); }
+
static void set_server(const char *envname, const char *defprotocol,
const char *defvalue, const char *defvalue_test,
const char *userspecified,
static void set_server(const char *envname, const char *defprotocol,
const char *defvalue, const char *defvalue_test,
const char *userspecified,
@@
-211,7
+218,8
@@
int main(int argc, char **argv) {
IS("--best-prices")) o_outmode_kind=omk_str,
o_outmode_str=arg+2;
IS("--best-prices")) o_outmode_kind=omk_str,
o_outmode_str=arg+2;
- else if (IS("--screenshot-file")) o_screenshot_fn= ARGVAL;
+ else if (IS("--screenshot-file")||
+ IS("--screenshots-file")) o_screenshot_fn= ARGVAL;
else if (IS("--pctb-server")) o_serv_pctb= ARGVAL;
else if (IS("--dict-submit-server")) o_serv_dict_submit= ARGVAL;
else if (IS("--dict-update-server")) o_serv_dict_fetch= ARGVAL;
else if (IS("--pctb-server")) o_serv_pctb= ARGVAL;
else if (IS("--dict-submit-server")) o_serv_dict_submit= ARGVAL;
else if (IS("--dict-update-server")) o_serv_dict_fetch= ARGVAL;
@@
-311,7
+319,7
@@
int main(int argc, char **argv) {
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
- find_islandname(
page_images[0]->rgb
);
+ find_islandname();
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
sysassert(! setenv("YPPSC_ISLAND",island,1) );
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
sysassert(! setenv("YPPSC_ISLAND",island,1) );
@@
-411,7
+419,7
@@
void sysassert_fail(const char *file, int line, const char *what) {
_exit(16);
}
_exit(16);
}
-void waitpid_check_exitstatus(pid_t pid, const char *what) {
+void waitpid_check_exitstatus(pid_t pid, const char *what
, int sigpipeok
) {
pid_t got;
int st;
for (;;) {
pid_t got;
int st;
for (;;) {
@@
-426,8
+434,9
@@
void waitpid_check_exitstatus(pid_t pid, const char *what) {
fatal("%s failed with nonzero exit status %d",
what, WEXITSTATUS(st));
} else if (WIFSIGNALED(st)) {
fatal("%s failed with nonzero exit status %d",
what, WEXITSTATUS(st));
} else if (WIFSIGNALED(st)) {
- fatal("%s died due to signal %s%s", what,
- strsignal(WTERMSIG(st)), WCOREDUMP(st)?" (core dumped)":"");
+ if (!sigpipeok || WTERMSIG(st) != SIGPIPE)
+ fatal("%s died due to signal %s%s", what,
+ strsignal(WTERMSIG(st)), WCOREDUMP(st)?" (core dumped)":"");
} else {
fatal("%s gave strange wait status %d", what, st);
}
} else {
fatal("%s gave strange wait status %d", what, st);
}