open_max

gpm-1.20.0.tar.gz

From - Thu Jun  7 00:06:49 2001
Return-Path: <[e-mail]>
Delivered-To: [e-mail]
Received: (qmail 2518 invoked by uid 0); 24 May 2001 02:14:58 -0000
Received: from dns.pcsystems.de (HELO pcsystems.de) (212.63.44.1)
  by www.schottelius.org with SMTP; 24 May 2001 02:14:58 -0000
Received: (qmail 22323 invoked by uid 577); 24 May 2001 02:30:59 -0000
Delivered-To: [e-mail]
Received: (qmail 22320 invoked by uid 0); 24 May 2001 02:30:57 -0000
Received: from unknown (HELO mir.prosa.it) (217.57.75.5)
  by dns.pcsystems.de with SMTP; 24 May 2001 02:30:57 -0000
Received: from mir.ascensit.com (localhost [127.0.0.1])
	by mir.prosa.it (Postfix) with ESMTP
	id 9B59F202; Thu, 24 May 2001 04:34:02 +0200 (CEST)
Delivered-To: [e-mail]
Received: from marine.sonic.net (marine.sonic.net [208.201.224.37])
	by mir.prosa.it (Postfix) with SMTP id 5E61E1F0
	for <[e-mail]>; Thu, 24 May 2001 04:33:00 +0200 (CEST)
Received: (qmail 11060 invoked from network); 24 May 2001 02:32:58 -0000
Received: from ultra.sonic.net (208.201.224.22)
  by marine.sonic.net with SMTP; 24 May 2001 02:32:58 -0000
Received: from thune.mrc-home.org (adsl-209-204-178-126.sonic.net [209.204.178.126])
	by ultra.sonic.net (8.11.2/8.8.5) with ESMTP id f4O2Wuc10136
	for <[e-mail]>; Wed, 23 May 2001 19:32:57 -0700
X-envelope-info: <[e-mail]>
Received: by thune.mrc-home.org (8.10.0) id f4O2WuA14534; Wed, 23 May 2001 19:32:56 -0700
From: Mike Castle <[e-mail]>
To: [e-mail]
Message-ID: <[e-mail]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.18i
Subject: [Gpm] another OPEN_MAX patch
Sender: [e-mail]
Errors-To: [e-mail]
X-BeenThere: [e-mail]
X-Mailman-Version: 2.0.3
Precedence: bulk
Reply-To: [e-mail]
X-Reply-To: Mike Castle <[e-mail]>
List-Help: <mailto:[e-mail]?subject=help>
List-Post: <mailto:[e-mail]>
List-Subscribe: <http://lists.prosa.it/cgi-bin/mailman/listinfo/gpm>,
	<mailto:[e-mail]?subject=subscribe>
List-Id: <gpm.lists.prosa.it>
List-Unsubscribe: <http://lists.prosa.it/cgi-bin/mailman/listinfo/gpm>,
	<mailto:[e-mail]?subject=unsubscribe>
List-Archive: <http://lists.prosa.it/pipermail/gpm/>
Date: Wed, 23 May 2001 19:32:56 -0700
X-Mozilla-Status: 8001
X-Mozilla-Status2: 00000000
X-UIDL: 990670498.2521.suppe


Having finally gotten around to recompiling gpm-1.19.3 with a recent glibc,
I came across the OPEN_MAX not being defined problem.

I didn't like any of the patches I saw on debian and redhat (granted I
didn't look too hard).

--- gpm-1.19.3.orig/special.c	Mon Jan 17 13:34:00 2000
+++ gpm-1.19.3/special.c	Wed May 23 19:16:43 2001
@@ -35,6 +35,7 @@
 #include <time.h>
 #include <errno.h>
 #include <sys/param.h>
+#include <limits.h>
 
 #include "gpmInt.h"
 
@@ -61,13 +62,25 @@
 static char *commandM="shutdown -h now";
 static char *commandR="shutdown -r now";
 
+/* More or less out of Stevens */
+static long int gpm_open_max(void)
+{
+#ifdef OPEN_MAX
+  return OPEN_MAX;
+#else
+  long int rc = sysconf(_SC_OPEN_MAX);
+  if (rc==-1) rc = 256;
+  return rc;
+#endif
+}
+
 /*
  * The return value is 0 if the event has been eaten,
  * 1 if the event is passed on
  */
 int processSpecial(Gpm_Event *event)
 {
-  char *command=NULL; int i;
+  char *command=NULL;
   FILE *consolef;
 
   if ((event->type & GPM_TRIPLE)
@@ -145,6 +158,7 @@
 
   switch(fork())
     {
+    long int i;
     case -1: /* error */
       fprintf(stderr,"%s: fork(): %s\n", prgname, strerror(errno));
       return 0; /* Hmmm.... error */
@@ -154,7 +168,7 @@
       open("/dev/null",O_RDONLY); /* stdin  */
       open("/dev/tty0",O_WRONLY); /* stdout */
       dup(1);                     /* stderr */
-      for (i=3;i<OPEN_MAX; i++) close(i);
+      for (i=3;i<gpm_open_max(); i++) close(i);
       execl("/bin/sh","sh","-c",command,(char *)NULL);
       exit(1); /* shouldn't happen */
       
@@ -162,8 +176,3 @@
       return 0;	
     }
 }
-
-
-
-
-

-- 
       Mike Castle       Life is like a clock:  You can work constantly
  [e-mail]  and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

__
Gpm mailing list at [e-mail]
Send help as subject to [e-mail] for help
Archives at http://lists.prosa.it/pipermail/gpm