X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=f065036b84cc97370ec7dca5a3b5cedd5a232e87;hb=86627bb14a123f183bd094e582e4cd9f2aca489a;hp=68c7442979c8ecc27c365a63e5d6368f216b6fed;hpb=cdf60d1ad704f2d17ca677af9dc093e7a81bd28e;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 68c744297..f065036b8 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,7 +1,7 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
 
-   Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006-2008 Free Software
+   Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2012 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,9 +19,11 @@
 
 #include <config.h>
 
+/* Specification.  */
+#include <stdlib.h>
+
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdlib.h>
 
 #if ENABLE_NLS
 # include <sys/types.h>
@@ -41,7 +43,7 @@
    The resulting string may only be used until the next nl_langinfo call.  */
 static const char *
 localized_pattern (const char *english_pattern, nl_item nl_index,
-		   bool posixly_correct)
+                   bool posixly_correct)
 {
   const char *translated_pattern;
 
@@ -63,7 +65,7 @@ localized_pattern (const char *english_pattern, nl_item nl_index,
       translated_pattern = nl_langinfo (nl_index);
       /* Check against a broken system return value.  */
       if (translated_pattern != NULL && translated_pattern[0] != '\0')
-	return translated_pattern;
+        return translated_pattern;
    }
 
   /* Look in the gnulib message catalog.  */
@@ -71,11 +73,11 @@ localized_pattern (const char *english_pattern, nl_item nl_index,
   if (translated_pattern == english_pattern)
     {
       /* The gnulib message catalog provides no translation.
-	 Try the system's message catalog.  */
+         Try the system's message catalog.  */
       translated_pattern = nl_langinfo (nl_index);
       /* Check against a broken system return value.  */
       if (translated_pattern != NULL && translated_pattern[0] != '\0')
-	return translated_pattern;
+        return translated_pattern;
       /* Fall back to English.  */
       translated_pattern = english_pattern;
     }
@@ -95,20 +97,20 @@ try (const char *response, const char *pattern, char **lastp, regex_t *re)
 
       /* The pattern has changed.  */
       if (*lastp != NULL)
-	{
-	  /* Free the old compiled pattern.  */
-	  regfree (re);
-	  free (*lastp);
-	  *lastp = NULL;
-	}
+        {
+          /* Free the old compiled pattern.  */
+          regfree (re);
+          free (*lastp);
+          *lastp = NULL;
+        }
       /* Put the PATTERN into safe memory before calling regcomp.
-	 (regcomp may call nl_langinfo, overwriting PATTERN's storage.  */
+         (regcomp may call nl_langinfo, overwriting PATTERN's storage.  */
       safe_pattern = strdup (pattern);
       if (safe_pattern == NULL)
-	return -1;
+        return -1;
       /* Compile the pattern and cache it for future runs.  */
       if (regcomp (re, safe_pattern, REG_EXTENDED) != 0)
-	return -1;
+        return -1;
       *lastp = safe_pattern;
     }
 
@@ -118,9 +120,6 @@ try (const char *response, const char *pattern, char **lastp, regex_t *re)
 #endif
 
 
-/* Test a user response to a question.
-   Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear.  */
-
 int
 rpmatch (const char *response)
 {
@@ -169,6 +168,6 @@ rpmatch (const char *response)
 #else
   /* Test against "^[yY]" and "^[nN]", hardcoded to avoid requiring regex */
   return (*response == 'y' || *response == 'Y' ? 1
-	  : *response == 'n' || *response == 'N' ? 0 : -1);
+          : *response == 'n' || *response == 'N' ? 0 : -1);
 #endif
 }