← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnupg/saucy-updates

« back to all changes in this revision

Viewing changes to intl/explodename.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-08-02 11:27:51 UTC
  • mfrom: (1.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20130802112751-np45f6mcog4qj3w8
Tags: 1.4.14-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Disable mlock() test since it fails with ulimit 0 (on buildds).
  - Set gpg (or gpg2) and gpgsm to use a passphrase agent by default.
  - Only suggest gnupg-curl and libldap; recommendations are pulled into
    minimal, and we don't need the keyserver utilities in a minimal Ubuntu
    system.
  - Remove the Win32 build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intl/explodename.c
1
 
/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
 
1
/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005, 2007 Free Software Foundation, Inc.
2
2
   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
3
3
 
4
4
   This program is free software; you can redistribute it and/or modify it
105
105
            {
106
106
              *normalized_codeset = _nl_normalize_codeset (*codeset,
107
107
                                                           cp - *codeset);
108
 
              if (strcmp (*codeset, *normalized_codeset) == 0)
 
108
              if (*normalized_codeset == NULL)
 
109
                return -1;
 
110
              else if (strcmp (*codeset, *normalized_codeset) == 0)
109
111
                free ((char *) *normalized_codeset);
110
112
              else
111
113
                mask |= XPG_NORM_CODESET;