Mercurial > hg > toybox
view toys/other/usleep.c @ 1613:96aa7ec74936 draft
Fix yet another sed bug.
The s/// command would copy the \ of substitutions before deciding what to
do with them (generally overwriting the \ with the new data). When the
substitution was A) at the very end of the new string, B) resolved to nothing,
it could leave a trailing \ that didn't belong there and didn't get overwritten
because the "copy trailing data" part that copies the original string's null
terminator already happened before the \ overwrote it.
The ghostwheel() function restarts regexes after embedded NUL bytes, but
if the string it's passed is _longer_ than the length it's told then it
gets confused (and it means we're off the end of our allocation so segfaults
are likely).
Fix: test for \ first and move the "copy byte" logic into an else case.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 15 Dec 2014 03:34:55 -0600 |
parents | 786841fdb1e0 |
children |
line wrap: on
line source
/* usleep.c - Wait for a number of microseconds. * * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com> USE_USLEEP(NEWTOY(usleep, "<1", TOYFLAG_BIN)) config USLEEP bool "usleep" default y help usage: usleep MICROSECONDS Pause for MICROSECONDS microseconds. */ #include "toys.h" void usleep_main(void) { struct timespec tv; long delay = atol(*toys.optargs); tv.tv_sec = delay/1000000; tv.tv_nsec = (delay%1000000) * 1000; toys.exitval = !!nanosleep(&tv, NULL); }