exit system.c, mutt_system goes into lib-sys/

[apps/madmutt.git] / getdomain.c

diff --git a/getdomain.c b/getdomain.c
index 23b2f48..204a693 100644 (file)
--- a/getdomain.c
+++ b/getdomain.c
@@ -1,7 +1,21 @@
+/*
+ * Copyright notice from original mutt:
+ * [none]
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+

 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 

+#include <lib-lib/file.h>

 #include "mutt.h"
 
 #ifndef STDC_HEADERS
 #include "mutt.h"
 
 #ifndef STDC_HEADERS


@@ -15,10 +29,10 @@ int fclose ();
 static void strip_trailing_dot (char *q)
 {
   char *p = q;
 static void strip_trailing_dot (char *q)
 {
   char *p = q;

-  
+

   for (; *q; q++)
     p = q;
   for (; *q; q++)
     p = q;

-  
+

   if (*p == '.')
     *p = '\0';
 }
   if (*p == '.')
     *p = '\0';
 }


@@ -30,32 +44,31 @@ int getdnsdomainname (char *s, size_t l)
   char *p = NULL;
   char *q;
 
   char *p = NULL;
   char *q;
 

-  if ((f = fopen ("/etc/resolv.conf", "r")) == NULL) return (-1);
+  if ((f = fopen ("/etc/resolv.conf", "r")) == NULL)
+    return (-1);

 
   tmp[sizeof (tmp) - 1] = 0;
 
 
   tmp[sizeof (tmp) - 1] = 0;
 

-  l--; /* save room for the terminal \0 */
+  l--;                          /* save room for the terminal \0 */

 
 

-  while (fgets (tmp, sizeof (tmp) - 1, f) != NULL)
-  {
+  while (fgets (tmp, sizeof (tmp) - 1, f) != NULL) {

     p = tmp;
     p = tmp;

-    while (ISSPACE (*p)) p++;
-    if (mutt_strncmp ("domain", p, 6) == 0 || mutt_strncmp ("search", p, 6) == 0)
-    {
+    while (ISSPACE (*p))
+      p++;
+    if (m_strncmp("domain", p, 6) == 0 || m_strncmp("search", p, 6) == 0) {

       p += 6;
       p += 6;

-      
+

       for (q = strtok (p, " \t\n"); q; q = strtok (NULL, " \t\n"))
       for (q = strtok (p, " \t\n"); q; q = strtok (NULL, " \t\n"))

-       if (strcmp (q, "."))
-         break;
-
-      if (q)
-      {
-       strip_trailing_dot (q);
-       strfcpy (s, q, l);
-       safe_fclose (&f);
-       return 0;
+        if (strcmp (q, "."))
+          break;
+
+      if (q) {
+        strip_trailing_dot (q);
+        m_strcpy(s, l, q);
+        safe_fclose (&f);
+        return 0;

       }
       }

-      
+

     }
   }
 
     }
   }