svn commit: r226834 - stable/9/usr.bin/csup

[Konstantin Belousov]

Author: kib
Date: Thu Oct 27 12:26:16 2011
New Revision: 226834
URL: http://svn.freebsd.org/changeset/base/226834

Log:
  MFC r225979:
  Update the comment.
  
  MFC r225980:
  Handle the situation where fixups_close() has been called but more fixups
  are still available on the queue.
  
  Approved by:	re (kensmith)

Modified:
  stable/9/usr.bin/csup/fixups.c
  stable/9/usr.bin/csup/updater.c
Directory Properties:
  stable/9/usr.bin/csup/   (props changed)

Modified: stable/9/usr.bin/csup/fixups.c
==============================================================================
--- stable/9/usr.bin/csup/fixups.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/fixups.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -141,7 +141,7 @@ fixups_get(struct fixups *f)
 	fixups_lock(f);
 	while (f->size == 0 && !f->closed)
 		pthread_cond_wait(&f->cond, &f->lock);
-	if (f->closed) {
+	if (f->closed && f->size == 0) {
 		fixups_unlock(f);
 		return (NULL);
 	}

Modified: stable/9/usr.bin/csup/updater.c
==============================================================================
--- stable/9/usr.bin/csup/updater.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/updater.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -238,7 +238,7 @@ updater(void *arg)
 
 	/*
 	 * Make sure to close the fixups even in case of an error,
-	 * so that the lister thread doesn't block indefinitely.
+	 * so that the detailer thread doesn't block indefinitely.
 	 */
 	fixups_close(up->config->fixups);
 	if (!error)