* 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"
* 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;
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;
}