← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnupg2/hardy-proposed

« back to all changes in this revision

Viewing changes to g10/openfile.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-05-15 13:54:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070515135455-89qfyalmgjy6gcqw
Tags: 2.0.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
  - Build-depend on libcurl3-gnutls-dev
  - g10/call-agent.c: set DBG_ASSUAN to 0 to suppress a debug message
  - Include /doc files as done with gnupg
  - debian/rules: add doc/com-certs.pem to the docs for gpgsm
  - debian/copyright: update download url
  - debian/README.Debian: remove note the gnupg2 isn't released yet.
  - debian/control: Change Maintainer/XSBC-Original-Maintainer field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/openfile.c
77
77
    if ( !strcmp ( fname, "/dev/null" ) )
78
78
        return 1; /* does not do any harm */
79
79
#endif
 
80
#ifdef HAVE_W32_SYSTEM
 
81
    if ( !strcmp ( fname, "nul" ) )
 
82
        return 1;
 
83
#endif
80
84
 
81
85
    /* fixme: add some backup stuff in case of overwrite */
82
86
    if( opt.answer_yes )
196
200
    char *buf = NULL;
197
201
    const char *name;
198
202
    
199
 
    if( opt.dry_run )
200
 
      name = "/dev/null";
 
203
    if ( opt.dry_run )
 
204
      {
 
205
#ifdef HAVE_W32_SYSTEM
 
206
        name = "nul";
 
207
#else
 
208
        name = "/dev/null";
 
209
#endif
 
210
      }
201
211
    else if( opt.outfile )
202
212
      name = opt.outfile;
203
213
    else {