summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-03-12 20:07:17 +0000
committerJim Meyering <jim@meyering.net>2000-03-12 20:07:17 +0000
commiteb31b32e807f805fc6923b91f525cc83786cec15 (patch)
treedfed19e0c2f5308e48601fd08bc74d103abd334e /src
parent83a446e62ab0578fd338bde5a2626d65e1336ace (diff)
downloadcoreutils-eb31b32e807f805fc6923b91f525cc83786cec15.tar.xz
Merge from textutils.
(O_BINARY, O_TEXT): Define if necessary. (SET_BINARY, SET_BINARY2): Define. (DEV_BSIZE): Define to BBSIZE if appropriate.
Diffstat (limited to 'src')
-rw-r--r--src/system.h43
1 files changed, 37 insertions, 6 deletions
diff --git a/src/system.h b/src/system.h
index e7f987d43..0847f15a6 100644
--- a/src/system.h
+++ b/src/system.h
@@ -152,6 +152,35 @@ extern int errno;
# define R_OK 4
#endif
+/* For systems that distinguish between text and binary I/O.
+ O_BINARY is usually declared in fcntl.h */
+#if !defined O_BINARY && defined _O_BINARY
+ /* For MSC-compatible compilers. */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+#if O_BINARY
+# ifndef __DJGPP__
+# define setmode _setmode
+# define fileno(_fp) _fileno (_fp)
+# endif /* not DJGPP */
+# define SET_BINARY(_f) do {if (!isatty(_f)) setmode (_f, O_BINARY);} while (0)
+# define SET_BINARY2(_f1, _f2) \
+ do { \
+ if (!isatty (_f1)) \
+ { \
+ setmode (_f1, O_BINARY); \
+ if (!isatty (_f2)) \
+ setmode (_f2, O_BINARY); \
+ } \
+ } while(0)
+#else
+# define SET_BINARY(f) (void)0
+# define SET_BINARY2(f1,f2) (void)0
+# define O_BINARY 0
+# define O_TEXT 0
+#endif /* O_BINARY */
+
#if HAVE_DIRENT_H
# include <dirent.h>
# define NLENGTH(direct) (strlen((direct)->d_name))
@@ -178,13 +207,15 @@ extern int errno;
/* Get or fake the disk device blocksize.
Usually defined by sys/param.h (if at all). */
+#if !defined DEV_BSIZE && defined BSIZE
+# define DEV_BSIZE BSIZE
+#endif
+#if !defined DEV_BSIZE && defined BBSIZE /* SGI */
+# define DEV_BSIZE BBSIZE
+#endif
#ifndef DEV_BSIZE
-# ifdef BSIZE
-# define DEV_BSIZE BSIZE
-# else /* !BSIZE */
-# define DEV_BSIZE 4096
-# endif /* !BSIZE */
-#endif /* !DEV_BSIZE */
+# define DEV_BSIZE 4096
+#endif
/* Extract or fake data from a `struct stat'.
ST_BLKSIZE: Preferred I/O blocksize for the file, in bytes.