Changeset 2560

Timestamp:

Mar 6, 2006, 7:02:54 PM (19 years ago)

Author:

bird

Message:

Initial porting.

Location:

trunk/coreutils

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lib/backupfile.c (modified) (1 diff)
• lib/fts.c (modified) (1 diff)
• lib/getcwd.c (modified) (1 diff)
• lib/regex_internal.h (modified) (1 diff)
• lib/utimens.c (modified) (1 diff)
• port.gmk (added)
• src/cut.c (modified) (1 diff)
• src/join.c (modified) (1 diff)
• src/pwd.c (modified) (1 diff)

trunk/coreutils/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-SUBDIRS = lib src doc man po tests
+#SUBDIRS = lib src doc man po tests - man is busted on os/2 - automake problem
+SUBDIRS = lib src doc po tests
 EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \

trunk/coreutils/configure.ac

@@ -26 +26 @@
 
 AB_INIT()
-AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2])
+dnl AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2])
+AM_INIT_AUTOMAKE([1.7.7 gnits dist-bzip2])
 
 gl_DEFAULT_POSIX2_VERSION

trunk/coreutils/lib/backupfile.c

@@ -64 +64 @@
 #endif
 
-#if D_INO_IN_DIRENT
+#if D_INO_IN_DIRENT && !defined(__INNOTEK_LIBC__) /* this will be fix in 0.7 and will then be removed! */
 # define REAL_DIR_ENTRY(dp) ((dp)->d_ino != 0)
 #else

trunk/coreutils/lib/fts.c

@@ -797 +797 @@
         cderrno = 0;
         if (nlinks || type == BREAD) {
+#ifdef __EMX__ /* will be fixed in libc 0.7 */
+                if (fts_safe_changedir(sp, cur, dirfd(dirp), cur->fts_accpath)) {
+#else
                 if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+#endif
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;

trunk/coreutils/lib/getcwd.c

@@ -96 +96 @@
 #endif
 
-#if D_INO_IN_DIRENT
+#if D_INO_IN_DIRENT && !defined(__INNOTEK_LIBC__) /* this will be fix in 0.7 and will then be removed! */
 # define MATCHING_INO(dp, ino) ((dp)->d_ino == (ino))
 #else

trunk/coreutils/lib/regex_internal.h

@@ -419 +419 @@
 #ifndef _LIBC
 # ifdef __i386__
-#  define internal_function   __attribute ((regparm (3), stdcall))
+#  ifdef __OS2__
+#   define internal_function   __attribute ((optlink))
+#  else
+#   define internal_function   __attribute ((regparm (3), stdcall))
+#  endif
 # else
 #  define internal_function

trunk/coreutils/lib/utimens.c

@@ -60 +60 @@
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
+
+#ifdef __INNOTEK_LIBC__ /* fs doesn't to better than seconds, but we must use futimes! */
+# define HAVE_WORKING_UTIMES 1
+#endif
+
 
 /* Set the access and modification time stamps of FD (a.k.a. FILE) to be

trunk/coreutils/src/cut.c

@@ -747 +747 @@
   char *spec_list_string IF_LINT(= NULL);
 
+#ifdef __EMX__
+  /* a undocumented hack */
+  if (getenv("CUT_BINARY_MODE"))
+    {
+      extern int _fmode_bin;
+      _fmode_bin = 1;
+      if (!isatty(fileno(stdout)))
+        freopen(NULL, "wb", stdout);
+      if (!isatty(fileno(stdin)))
+        freopen(NULL, "rb", stdin);
+    }
+#endif
+
   initialize_main (&argc, &argv);
   program_name = argv[0];

trunk/coreutils/src/join.c

@@ -791 +791 @@
   int i;
 
+#ifdef __EMX__
+  /* a undocumented hack */
+  if (getenv("JOIN_BINARY_MODE"))
+    {
+      extern int _fmode_bin;
+      _fmode_bin = 1;
+      if (!isatty(fileno(stdout)))
+        freopen(NULL, "wb", stdout);
+      if (!isatty(fileno(stdin)))
+        freopen(NULL, "rb", stdin);
+    }
+#endif
+
   initialize_main (&argc, &argv);
   program_name = argv[0];

trunk/coreutils/src/pwd.c

@@ -46 +46 @@
 };
 
-#ifdef D_INO_IN_DIRENT
+#if defined(D_INO_IN_DIRENT) && !defined(__INNOTEK_LIBC__) /* this will be fix in 0.7 and will then be removed! */
 # define D_INO(dp) ((dp)->d_ino)
 #else