card: Suppress error message by agent_scd_cardlist.

[gnupg.git] / g10 / dearmor.c

diff --git a/g10/dearmor.c b/g10/dearmor.c
index 6b15f49..92239cc 100644 (file)
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -1,21 +1,20 @@
 /* dearmor.c - Armor utility
- *     Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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-1307, USA
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -23,17 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 
-#include "errors.h"
-#include "iobuf.h"
-#include "memory.h"
-#include "util.h"
+#include "gpg.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
 #include "main.h"
-
+#include "../common/i18n.h"
 
 /****************
  * Take an armor file and write it out without armor
@@ -41,38 +39,43 @@
 int
 dearmor_file( const char *fname )
 {
-    armor_filter_context_t afx;
+    armor_filter_context_t *afx;
     IOBUF inp = NULL, out = NULL;
     int rc = 0;
     int c;
 
-    memset( &afx, 0, sizeof afx);
+    afx = new_armor_context ();
 
     /* prepare iobufs */
-    if( !(inp = iobuf_open(fname)) ) {
-       log_error("can't open %s: %s\n", fname? fname: "[stdin]",
+    inp = iobuf_open(fname);
+    if (inp && is_secured_file (iobuf_get_fd (inp)))
+      {
+        iobuf_close (inp);
+        inp = NULL;
+        gpg_err_set_errno (EPERM);
+      }
+    if (!inp) {
+        rc = gpg_error_from_syserror ();
+       log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
                                        strerror(errno) );
-       rc = G10ERR_OPEN_FILE;
        goto leave;
     }
 
-    iobuf_push_filter( inp, armor_filter, &afx );
+    push_armor_filter ( afx, inp );
 
-    if( (rc = open_outfile( fname, 0, &out )) )
+    if( (rc = open_outfile (-1, fname, 0, 0, &out)) )
        goto leave;
 
-
-
     while( (c = iobuf_get(inp)) != -1 )
        iobuf_put( out, c );
 
-
   leave:
     if( rc )
        iobuf_cancel(out);
     else
        iobuf_close(out);
     iobuf_close(inp);
+    release_armor_context (afx);
     return rc;
 }
 
@@ -83,28 +86,35 @@ dearmor_file( const char *fname )
 int
 enarmor_file( const char *fname )
 {
-    armor_filter_context_t afx;
+    armor_filter_context_t *afx;
     IOBUF inp = NULL, out = NULL;
     int rc = 0;
     int c;
 
-    memset( &afx, 0, sizeof afx);
+    afx = new_armor_context ();
 
     /* prepare iobufs */
-    if( !(inp = iobuf_open(fname)) ) {
-       log_error("can't open %s: %s\n", fname? fname: "[stdin]",
-                                       strerror(errno) );
-       rc = G10ERR_OPEN_FILE;
+    inp = iobuf_open(fname);
+    if (inp && is_secured_file (iobuf_get_fd (inp)))
+      {
+        iobuf_close (inp);
+        inp = NULL;
+        gpg_err_set_errno (EPERM);
+      }
+    if (!inp) {
+        rc = gpg_error_from_syserror ();
+       log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
+                  strerror(errno) );
        goto leave;
     }
 
 
-    if( (rc = open_outfile( fname, 1, &out )) )
+    if( (rc = open_outfile (-1, fname, 1, 0, &out )) )
        goto leave;
 
-    afx.what = 4;
-    afx.hdrlines = "Comment: Use \"gpgm --dearmor\" for unpacking\n";
-    iobuf_push_filter( out, armor_filter, &afx );
+    afx->what = 4;
+    afx->hdrlines = "Comment: Use \"gpg --dearmor\" for unpacking\n";
+    push_armor_filter ( afx, out );
 
     while( (c = iobuf_get(inp)) != -1 )
        iobuf_put( out, c );
@@ -116,7 +126,6 @@ enarmor_file( const char *fname )
     else
        iobuf_close(out);
     iobuf_close(inp);
+    release_armor_context (afx);
     return rc;
 }
-
-