Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › a4f90df
Fix fdopen(3) and wait(2) in pkg_repo_create.
Vsevolod Stakhov committed 11 years ago
commit a4f90dfc056a92282f78b7b297dd0e22e203dfe7
parent 636a24f
1 file changed +8 -3
modified libpkg/pkg_repo_create.c
@@ -374,7 +374,7 @@ pkg_create_repo_worker(struct pkg_fts_item *start, size_t nelts,
					goto cleanup;

				}

				fpos = lseek(ffd, 0, SEEK_END);
- 
				fl = fdopen(ffd, "a");
+ 
				fl = fdopen(dup(ffd), "a");

				pkg_emit_filelist(pkg, fl);

				fclose(fl);
@@ -560,7 +560,7 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,
	if (filelist) {

		snprintf(filesite, sizeof(filesite), "%s/%s", output_dir,

		    meta->filesite);
- 
		if ((fd = open(packagesite, O_CREAT|O_TRUNC|O_WRONLY, 00644)) == -1) {
+ 
		if ((fd = open(filesite, O_CREAT|O_TRUNC|O_WRONLY, 00644)) == -1) {

			retcode = EPKG_FATAL;

			goto cleanup;

		}
@@ -641,8 +641,13 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,
						 */

						int st;
- 
						if (wait(&st) == -1)
+ 
						while (wait(&st) == -1) {
+ 
							if (errno == EINTR)
+ 
								continue;
+ 


							pkg_emit_errno("pkg_create_repo", "wait");
+ 
							break;
+ 
						}



						num_workers --;

					}