Changeset 279 for trunk/src/sh_unix.c

Timestamp:

Apr 30, 2010, 11:55:18 PM (14 years ago)

Author:

katerina

Message:

Fix for tickets #200 to #206 (kernel check, login checks, bugfixes).

File:

• trunk/src/sh_unix.c (modified) (6 diffs)

trunk/src/sh_unix.c

@@ -670 +670 @@
     sig_force_check = 1;
 #endif
+#ifdef SIGTTIN
+  if (mysignal == SIGTTIN)
+    sig_fresh_trail = 1;
+#endif
 #ifdef SIGABRT
   if (mysignal == SIGABRT)
@@ -837 +841 @@
   retry_sigaction(FIL__, __LINE__, SIGTSTP,   &ignact, &oldact);
 #endif
-#ifdef SIGTTIN
-  retry_sigaction(FIL__, __LINE__, SIGTTIN,   &ignact, &oldact);
-#endif
+
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
 #ifdef SIGTTOU
@@ -847 +849 @@
     retry_sigaction(FIL__, __LINE__, SIGTTOU,   &ignact, &oldact);
 #endif
+#ifdef SIGTTIN
+  if (goDaemon == 1)
+    retry_sigaction(FIL__, __LINE__, SIGTTIN,     &act2, &oldact);
+  else
+    retry_sigaction(FIL__, __LINE__, SIGTTIN,   &ignact, &oldact);
+#endif
 #else
 #ifdef SIGTTOU
   retry_sigaction(FIL__, __LINE__, SIGTTOU,   &ignact, &oldact);
+#endif
+#ifdef SIGTTIN
+  retry_sigaction(FIL__, __LINE__, SIGTTIN,   &ignact, &oldact);
 #endif
 #endif
@@ -3128 +3139 @@
   SL_RETURN(0, _("sh_unix_getinfo_attr"));
 }
-#else
-static 
-int sh_unix_getinfo_attr (char * name, 
-                          unsigned long * flags, 
-                          char * c_attr,
-                          int fd, struct stat * buf)
-{
-  return 0;
-}
 
 /* defined(__linux__) || defined(HAVE_STAT_FLAGS) */
@@ -3905 +3907 @@
   theFile->attributes      =    0;
 
+#if (defined(__linux__) && (defined(HAVE_LINUX_EXT2_FS_H) || defined(HAVE_EXT2FS_EXT2_FS_H))) || defined(HAVE_STAT_FLAGS)
   if (theFile->c_mode[0] != 'c' && theFile->c_mode[0] != 'b' &&
       theFile->c_mode[0] != 'l' )
@@ -3910 +3913 @@
                          &theFile->attributes, theFile->c_attributes, 
                          fd, &buf);
+#endif
 #endif