X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Funix.c;h=38389b2776be60ae055c56d6b304b13f98654a7d;hp=8a1b86017858267505ec6a18deadad01fc98bc13;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=18da1add170065091118e7379b58d1e385faf0cd

diff --git a/lib-sys/unix.c b/lib-sys/unix.c
index 8a1b860..38389b2 100644
--- a/lib-sys/unix.c
+++ b/lib-sys/unix.c
@@ -8,16 +8,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <lib-lib/macros.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
 
 #include "unix.h"
 #include "mutt_signal.h"
@@ -29,7 +20,7 @@
  * otherwise assume that the GECOS field is a comma-separated list.
  * Replace "&" by a capitalized version of the user's login name.
  */
-ssize_t mutt_gecos_name(char *dst, ssize_t n, struct passwd *pw, rx_t *rx)
+ssize_t mutt_gecos_name(char *dst, ssize_t n, struct passwd *pw, regex_t *rx)
 {
     const char *p, *end;
     ssize_t len;
@@ -43,7 +34,7 @@ ssize_t mutt_gecos_name(char *dst, ssize_t n, struct passwd *pw, rx_t *rx)
     if (rx) {
         regmatch_t pat_match[1];
 
-        if (regexec(rx->rx, pw->pw_gecos, 1, pat_match, 0)) {
+        if (regexec(rx, pw->pw_gecos, 1, pat_match, 0)) {
             return 0;
         }
 
@@ -184,7 +175,7 @@ int getdnsdomainname(char *s, ssize_t n)
             trailing_dot = q[-1] == '.';
             if (!trailing_dot || q > p + 1) {
                 m_strncpy(s, n, p, q - trailing_dot - p);
-                safe_fclose(&f);
+                m_fclose(&f);
                 return 0;
             }
 
@@ -192,6 +183,6 @@ int getdnsdomainname(char *s, ssize_t n)
         }
     }
 
-    safe_fclose (&f);
+    m_fclose(&f);
     return -1;
 }