undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/fix-sol-pack' into next

Browse Source 
* lt/fix-sol-pack:
  Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
  safe_fgets() - even more anal fgets()
This commit is contained in:
Junio C Hamano 2006-04-03 23:43:16 -07:00
commit 7941602983
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pack-objects.c
View File

@ -1118,9 +1118,10 @@ int main(int argc, char **argv)
break; break;
if (!ferror(stdin)) if (!ferror(stdin))
die("fgets returned NULL, not EOF, not error!"); die("fgets returned NULL, not EOF, not error!");
if (errno == EINTR) if (errno != EINTR)
continue; die("fgets: %s", strerror(errno));
die("fgets: %s", strerror(errno)); clearerr(stdin);
continue;
} }
if (line[0] == '-') { if (line[0] == '-') {

28
read-tree.c
View File

@ -273,10 +273,26 @@ static void unlink_entry(char *name)
static void progress_interval(int signum) static void progress_interval(int signum)
{ {
signal(SIGALRM, progress_interval);
progress_update = 1; 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 void check_updates(struct cache_entry **src, int nr)
{ {
static struct checkout state = { 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; unsigned last_percent = 200, cnt = 0, total = 0;
if (update && verbose_update) { if (update && verbose_update) {
struct itimerval v;
for (total = cnt = 0; cnt < nr; cnt++) { for (total = cnt = 0; cnt < nr; cnt++) {
struct cache_entry *ce = src[cnt]; struct cache_entry *ce = src[cnt];
if (!ce->ce_mode || ce->ce_flags & mask) if (!ce->ce_mode || ce->ce_flags & mask)
@ -302,12 +316,8 @@ static void check_updates(struct cache_entry **src, int nr)
total = 0; total = 0;
if (total) { 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"); fprintf(stderr, "Checking files out...\n");
setup_progress_signal();
progress_update = 1; progress_update = 1;
} }
cnt = 0; cnt = 0;
@ -341,8 +351,8 @@ static void check_updates(struct cache_entry **src, int nr)
} }
} }
if (total) { if (total) {
fputc('\n', stderr);
signal(SIGALRM, SIG_IGN); signal(SIGALRM, SIG_IGN);
fputc('\n', stderr);
} }
} }