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:
  pack-objects: be incredibly anal about stdio semantics
  Fix Solaris stdio signal handling stupidities

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-02 13:54:28 -07:00
commit f0c979f4db
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pack-objects.c
View File

@ -58,7 +58,7 @@ static int nr_objects = 0, nr_alloc = 0, nr_result = 0;
static const char *base_name; static const char *base_name;
static unsigned char pack_file_sha1[20]; static unsigned char pack_file_sha1[20];
static int progress = 1; static int progress = 1;
static volatile int progress_update = 0; static volatile sig_atomic_t progress_update = 0;
/* /*
* The object names in objects array are hashed with this hashtable, * The object names in objects array are hashed with this hashtable,
@ -879,7 +879,6 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
static void progress_interval(int signum) static void progress_interval(int signum)
{ {
signal(SIGALRM, progress_interval);
progress_update = 1; progress_update = 1;
} }
@ -1025,6 +1024,23 @@ static int reuse_cached_pack(unsigned char *sha1, int pack_to_stdout)
return 1; return 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);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
SHA_CTX ctx; SHA_CTX ctx;
@ -1090,18 +1106,23 @@ int main(int argc, char **argv)
prepare_packed_git(); prepare_packed_git();
if (progress) { if (progress) {
struct itimerval v;
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, "Generating pack...\n"); fprintf(stderr, "Generating pack...\n");
setup_progress_signal();
} }
while (fgets(line, sizeof(line), stdin) != NULL) { for (;;) {
unsigned char sha1[20]; unsigned char sha1[20];
if (!fgets(line, sizeof(line), stdin)) {
if (feof(stdin))
break;
if (!ferror(stdin))
die("fgets returned NULL, not EOF, not error!");
if (errno == EINTR)
continue;
die("fgets: %s", strerror(errno));
}
if (line[0] == '-') { if (line[0] == '-') {
if (get_sha1_hex(line+1, sha1)) if (get_sha1_hex(line+1, sha1))
die("expected edge sha1, got garbage:\n %s", die("expected edge sha1, got garbage:\n %s",