From 83963510edc09860c8e1b765e4e3c9254507ecde Mon Sep 17 00:00:00 2001
From: Philipp Klaus <philipp.klaus@gmail.com>
Date: Tue, 21 Jun 2011 17:12:22 +0200
Subject: automatic commit for pwgen-2.06

---
 pw_phonemes.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'pw_phonemes.c')

diff --git a/pw_phonemes.c b/pw_phonemes.c
index 57633c3..255ee57 100644
--- a/pw_phonemes.c
+++ b/pw_phonemes.c
@@ -90,6 +90,14 @@ try_again:
 		/* Don't allow us to overflow the buffer */
 		if (len > size-c)
 			continue;
+
+		/* Handle the AMBIGUOUS flag */
+		if (pw_flags & PW_AMBIGUOUS) {
+			cp = strpbrk(str, pw_ambiguous);
+			if (cp)
+				continue;
+		}
+
 		/*
 		 * OK, we found an element which matches our criteria,
 		 * let's do it!
@@ -107,15 +115,6 @@ try_again:
 		
 		c += len;
 		
-		/* Handle the AMBIGUOUS flag */
-		if (pw_flags & PW_AMBIGUOUS) {
-			cp = strpbrk(buf, pw_ambiguous);
-			if (cp) {
-				*cp = 0;
-				c = strlen(buf);
-			}
-		}
-		
 		/* Time to stop? */
 		if (c >= size)
 			break;
-- 
cgit v1.2.3