diff options
| -rw-r--r-- | pack-objects.c | 7 | ||||
| -rw-r--r-- | read-tree.c | 28 |
2 files changed, 23 insertions, 12 deletions
diff --git a/pack-objects.c b/pack-objects.c index 0ea16ad67f..d7ba938af7 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1118,9 +1118,10 @@ int main(int argc, char **argv) break; if (!ferror(stdin)) die("fgets returned NULL, not EOF, not error!"); - if (errno == EINTR) - continue; - die("fgets: %s", strerror(errno)); + if (errno != EINTR) + die("fgets: %s", strerror(errno)); + clearerr(stdin); + continue; } if (line[0] == '-') { diff --git a/read-tree.c b/read-tree.c index eaff444196..4422dbf424 100644 --- a/read-tree.c +++ b/read-tree.c @@ -273,10 +273,26 @@ static void unlink_entry(char *name) static void progress_interval(int signum) { - signal(SIGALRM, progress_interval); progress_update = 1; } +static void setup_progress_signal(void) +{ + struct sigaction sa; + struct itimerval v; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = progress_interval; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; + sigaction(SIGALRM, &sa, NULL); + + v.it_interval.tv_sec = 1; + v.it_interval.tv_usec = 0; + v.it_value = v.it_interval; + setitimer(ITIMER_REAL, &v, NULL); +} + static void check_updates(struct cache_entry **src, int nr) { static struct checkout state = { @@ -289,8 +305,6 @@ static void check_updates(struct cache_entry **src, int nr) unsigned last_percent = 200, cnt = 0, total = 0; if (update && verbose_update) { - struct itimerval v; - for (total = cnt = 0; cnt < nr; cnt++) { struct cache_entry *ce = src[cnt]; if (!ce->ce_mode || ce->ce_flags & mask) @@ -302,12 +316,8 @@ static void check_updates(struct cache_entry **src, int nr) total = 0; if (total) { - v.it_interval.tv_sec = 1; - v.it_interval.tv_usec = 0; - v.it_value = v.it_interval; - signal(SIGALRM, progress_interval); - setitimer(ITIMER_REAL, &v, NULL); fprintf(stderr, "Checking files out...\n"); + setup_progress_signal(); progress_update = 1; } cnt = 0; @@ -341,8 +351,8 @@ static void check_updates(struct cache_entry **src, int nr) } } if (total) { - fputc('\n', stderr); signal(SIGALRM, SIG_IGN); + fputc('\n', stderr); } } |