aboutsummaryrefslogtreecommitdiffstats
path: root/common/mbox-util.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--common/mbox-util.c (renamed from g10/mailbox.c)27
1 files changed, 18 insertions, 9 deletions
diff --git a/g10/mailbox.c b/common/mbox-util.c
index 64b818f37..332f62fa8 100644
--- a/g10/mailbox.c
+++ b/common/mbox-util.c
@@ -1,15 +1,25 @@
-/* mailbox.c - Mail address helper functions
+/* mbox-util.c - Mail address helper functions
* Copyright (C) 1998-2010 Free Software Foundation, Inc.
- * Copyright (C) 2014-2015 Werner Koch
+ * Copyright (C) 1998-2015 Werner Koch
*
* This file is part of GnuPG.
*
- * GnuPG 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 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - 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.
+ *
+ * or both in parallel, as here.
+ *
+ * This file 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.
@@ -25,9 +35,8 @@
#include <unistd.h>
#include <errno.h>
-#include "gpg.h"
#include "util.h"
-#include "main.h"
+#include "mbox-util.h"
static int