300-006_better_file_error.patch

来自「Linux Home Server 是专门为家庭和SOHO/SMB 设计的高性价」· PATCH 代码 · 共 45 行

#!/bin/sh -e
## 006_better_file_error.dpatch by David Kimdon <[e-mail]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Specify which filename is causing an error if the filename is a
## DP: directory. (#45832)

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
Index: binutils-2.17/bfd/opncls.c
===================================================================
--- binutils-2.17.orig/bfd/opncls.c	2007-06-28 09:19:34.818943168 +0200
+++ binutils-2.17/bfd/opncls.c	2007-06-28 09:19:35.993764568 +0200
@@ -158,6 +158,13 @@
 {
   bfd *nbfd;
   const bfd_target *target_vec;
+  struct stat s;
+
+  if (stat (filename, &s) == 0)
+    if (S_ISDIR(s.st_mode)) {
+      bfd_set_error (bfd_error_file_not_recognized);
+      return NULL;
+    }
 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)