Merge changes from CUPS 1.4svn-r8628.

[thirdparty/cups.git] / notifier / testnotify.c

diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index d334a4a9e715b2cb9ad047342ed3b7a0b8e71266..1b8921839ddbb6352d9f46c1ea496c1c14ef8140 100644 (file)
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $"
+ * "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Test notifier for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
@@ -61,6 +52,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   fprintf(stderr, "DEBUG: argc=%d\n", argc);
   for (i = 0; i < argc; i ++)
     fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
+  fprintf(stderr, "DEBUG: TMPDIR=\"%s\"\n", getenv("TMPDIR"));
 
   for (;;)
   {
@@ -82,6 +74,14 @@ main(int  argc,                              /* I - Number of command-line arguments */
 
     print_attributes(event, 4);
     ippDelete(event);
+
+   /*
+    * If the recipient URI is "testnotify://nowait", then we exit after each
+    * event...
+    */
+
+    if (!strcmp(argv[1], "testnotify://nowait"))
+      return (0);
   }
 }
 
@@ -281,5 +281,5 @@ print_attributes(ipp_t *ipp,                /* I - IPP request */
 
 
 /*
- * End of "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $".
+ * End of "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $".
  */