jocke@1700: #!/bin/sh -e jocke@1700: ## 006_better_file_error.dpatch by David Kimdon jocke@1700: ## jocke@1700: ## All lines beginning with `## DP:' are a description of the patch. jocke@1700: ## DP: Specify which filename is causing an error if the filename is a jocke@1700: ## DP: directory. (#45832) jocke@1700: jocke@1700: if [ $# -ne 1 ]; then jocke@1700: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" jocke@1700: exit 1 jocke@1700: fi jocke@1700: jocke@1700: [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts jocke@1700: patch_opts="${patch_opts:--f --no-backup-if-mismatch}" jocke@1700: jocke@1700: case "$1" in jocke@1700: -patch) patch $patch_opts -p1 < $0;; jocke@1700: -unpatch) patch $patch_opts -p1 -R < $0;; jocke@1700: *) jocke@1700: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" jocke@1700: exit 1;; jocke@1700: esac jocke@1700: jocke@1700: exit 0 jocke@1700: jocke@1700: @DPATCH@ jocke@1700: diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c yann@2088: yann@2088: diff -durN binutils-2.20.1.orig/bfd/opncls.c binutils-2.20.1/bfd/opncls.c yann@2088: --- binutils-2.20.1.orig/bfd/opncls.c 2010-01-14 11:48:22.000000000 +0100 yann@2088: +++ binutils-2.20.1/bfd/opncls.c 2010-08-17 19:32:23.000000000 +0200 yann@2088: @@ -183,6 +183,13 @@ jocke@1700: { jocke@1700: bfd *nbfd; jocke@1700: const bfd_target *target_vec; jocke@1700: + struct stat s; jocke@1700: + jocke@1700: + if (stat (filename, &s) == 0) jocke@1700: + if (S_ISDIR(s.st_mode)) { jocke@1700: + bfd_set_error (bfd_error_file_not_recognized); jocke@1700: + return NULL; jocke@1700: + } jocke@1700: jocke@1700: nbfd = _bfd_new_bfd (); jocke@1700: if (nbfd == NULL)