more updates in the build system, gettext related.

[apps/madmutt.git] / headers.c

diff --git a/headers.c b/headers.c
index c83d6d7..3cedeb6 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -1,29 +1,25 @@
-/* 
+/*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * 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 <lib-lib/macros.h>
+
 #include "mutt.h"
+#include "ascii.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
+#include "lib/debug.h"
+
 #include <sys/stat.h>
 #include <string.h>
 #include <ctype.h>
@@ -73,8 +69,7 @@ void mutt_edit_headers (const char *editor,
   mutt_edit_file (editor, path);
   stat (path, &st);
   if (mtime == st.st_mtime) {
-    dprint (1,
-            (debugfile, "ci_edit_headers(): temp file was not modified.\n"));
+    debug_print (1, ("temp file was not modified.\n"));
     /* the file has not changed! */
     mutt_unlink (path);
     return;
@@ -150,14 +145,14 @@ void mutt_edit_headers (const char *editor,
       SKIPWS (p);
       if (*p) {
         if ((q = strpbrk (p, " \t"))) {
-          mutt_substrcpy (path, p, q, sizeof (path));
+          str_substrcpy (path, p, q, sizeof (path));
           SKIPWS (q);
         }
         else
           strfcpy (path, p, sizeof (path));
         mutt_expand_path (path, sizeof (path));
         if ((body = mutt_make_file_attach (path))) {
-          body->description = safe_strdup (q);
+          body->description = str_dup (q);
           for (parts = msg->content; parts->next; parts = parts->next);
           parts->next = body;
         }