hush.in: Close extraneous file descriptors when running the command.

[misc] / locking.c

diff --git a/locking.c b/locking.c
index cf2917a6008ca5c3f1b6578ed64e13ea91bec660..8931dbd7dc5d382e0514452232eac703b8c177e2 100644 (file)
--- a/locking.c
+++ b/locking.c
@@ -7,7 +7,7 @@
  * (c) 2003 Mark Wooding
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Toys utilties collection.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Toys is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Toys; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
   struct flock l;
   char *p;
   int t = -1;
-  unsigned int ot;
+  unsigned int ot = 0;
   time_t nt;
   pid_t kid;
   int st;
@@ -224,7 +224,9 @@ doneopts:
       errno = 0;
   }
   signal(SIGALRM, oalrm);
-  if (ot) {
+  if (!ot)
+    alarm(0);
+  else {
     nt = time(0) - nt;
     if (nt > ot)
       raise(SIGALRM);