X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=80f176ad567da72d6e87e6bda2b3aaba0ac0a714;hb=12b118fd416fb96309d9e4ef65336e08441594c1;hp=ca2428d874d9a7b87ee0f3b231fc8f37bb7594c8;hpb=8fc3ec638c7e516f4610775488f2e7f40689a68f;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index ca2428d..80f176a 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -322,7 +322,8 @@ static void wait_for_stability(Snapshot **output, /* waits longer if we're going to return an image identical to previously * if previously==0, all images are considered identical to it */ - char *doing= masprintf(fmt,al); + char *doing; + sysassert( vasprintf(&doing,fmt,al) >=0 ); progress("%s",doing); debugf("PAGING wait_for_stability" @@ -543,6 +544,7 @@ timestamp(); send_key(XK_w); send_key(XK_Return); sync_after_input(); + sysassert(! usleep(1000000) ); } void take_screenshots(void) { @@ -694,7 +696,7 @@ void find_yppclient_window(void) { #define ASSIGN(what, start, end) \ what= masprintf("%.*s", (end)-(start), start); \ - if (o_##what) REQUIRE( !strcmp(o_##what, what) ); \ + if (o_##what) REQUIRE( !strcasecmp(o_##what, what) ); \ else ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix)); @@ -712,8 +714,9 @@ void find_yppclient_window(void) { if (children1) XFree(children1); } if (nfound>1) - fatal("Found several possible YPP clients." - " Close one, or specify the windowid with --window-id.\n"); + fatal("Found several possible YPP clients. Close one,\n" + " disambiguate with --pirate or --ocean," + " or specify --window-id.\n"); if (nfound<1) fatal("Did not find %sYPP client." " Use --window-id and/or report this as a fault.\n",