aboutsummaryrefslogtreecommitdiffstats
path: root/general.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2006-10-10 14:15:34 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:58 +0000
commit0628567a28f3510f506ae46cb9b24b73a6d2dc5d (patch)
treeda84934c41272cdc655694846c15c1c5db807445 /general.c
parent95732b497d12c98613bb3c5db16b61f377501a59 (diff)
downloadandroid_external_bash-0628567a28f3510f506ae46cb9b24b73a6d2dc5d.tar.gz
android_external_bash-0628567a28f3510f506ae46cb9b24b73a6d2dc5d.tar.bz2
android_external_bash-0628567a28f3510f506ae46cb9b24b73a6d2dc5d.zip
Imported from ../bash-3.2.tar.gz.
Diffstat (limited to 'general.c')
-rw-r--r--general.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/general.c b/general.c
index 3384e84..4ac4de0 100644
--- a/general.c
+++ b/general.c
@@ -48,7 +48,6 @@ extern int errno;
#endif /* !errno */
extern int expand_aliases;
-extern int interrupt_immediately;
extern int interactive_comments;
extern int check_hashed_filenames;
extern int source_uses_path;
@@ -477,8 +476,13 @@ check_binary_file (sample, sample_len)
if (c == '\n')
return (0);
+#if 0
if (ISSPACE (c) == 0 && ISPRINT (c) == 0)
+#else
+ if (c == '\0')
+#endif
return (1);
+
}
return (0);
@@ -503,7 +507,7 @@ int
file_iswdir (fn)
char *fn;
{
- return (file_isdir (fn) && test_eaccess (fn, W_OK) == 0);
+ return (file_isdir (fn) && sh_eaccess (fn, W_OK) == 0);
}
/* Return 1 if STRING contains an absolute pathname, else 0. Used by `cd'