diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-03-18 15:05:35 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-03-18 15:05:35 +0000 |
| commit | d25179979f43e421187929fea9197c5e5058ce4f (patch) | |
| tree | 2db7e52e456efeeb40da2ac9c0f7f5f87dc14b06 /pkgtools/cwrappers | |
| parent | dfabd45cf5cf98db06bca7c60f234edec57f8b72 (diff) | |
| download | pkgsrc-d25179979f43e421187929fea9197c5e5058ce4f.tar.gz | |
cwrappers-20150318: Don't ferror() after fclose().
Fixes libtool cwrapper on Linux, ok joerg@
Diffstat (limited to 'pkgtools/cwrappers')
| -rw-r--r-- | pkgtools/cwrappers/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/cwrappers/files/bin/fixup-libtool.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/cwrappers/Makefile b/pkgtools/cwrappers/Makefile index 055be124615..b59f29d3343 100644 --- a/pkgtools/cwrappers/Makefile +++ b/pkgtools/cwrappers/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/03/17 18:39:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2015/03/18 15:05:35 jperkin Exp $ -PKGNAME= cwrappers-20150317 +PKGNAME= cwrappers-20150318 CATEGORIES= pkgtools sysutils MAINTAINER= joerg@NetBSD.org diff --git a/pkgtools/cwrappers/files/bin/fixup-libtool.c b/pkgtools/cwrappers/files/bin/fixup-libtool.c index d4aa7244193..652ac4e0feb 100644 --- a/pkgtools/cwrappers/files/bin/fixup-libtool.c +++ b/pkgtools/cwrappers/files/bin/fixup-libtool.c @@ -1,4 +1,4 @@ -/* $NetBSD: fixup-libtool.c,v 1.4 2014/12/30 15:13:20 wiz Exp $ */ +/* $NetBSD: fixup-libtool.c,v 1.5 2015/03/18 15:05:36 jperkin Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -390,8 +390,9 @@ fixup_libtool_la(const char *lafile, int in_lai) } free(line); - fclose(fp); - if (ferror(fp) || fclose(output) || rename(tmp_name, lafile)) { + if (ferror(fp) || fclose(fp) || + ferror(output) || fclose(output) || + rename(tmp_name, lafile)) { unlink(tmp_name); err(255, "output processing failed"); } |