summaryrefslogtreecommitdiff
path: root/palm/pose
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>2000-06-22 19:16:00 +0000
committerDirk Froemberg <dirk@FreeBSD.org>2000-06-22 19:16:00 +0000
commit0b91f3fcf609d6d10d32f97a8a18dda84264e628 (patch)
tree1347be38d0f1ddce0cbe449ec0fe1efa5025f20c /palm/pose
parentMove local distfiles to ${MASTER_SITE_LOCAL}/fenner . (diff)
"Don't close stdin accidentally."
Submitted by: Alex Vasylenko <lxv@nest.org>
Notes
Notes: svn path=/head/; revision=29789
Diffstat (limited to 'palm/pose')
-rw-r--r--palm/pose/files/patch-ad11
-rw-r--r--palm/pose/files/patch-ae118
2 files changed, 129 insertions, 0 deletions
diff --git a/palm/pose/files/patch-ad b/palm/pose/files/patch-ad
new file mode 100644
index 000000000000..c3f8db902250
--- /dev/null
+++ b/palm/pose/files/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.am- Wed Apr 19 11:27:37 2000
++++ Makefile.am Mon Jun 19 02:48:11 2000
+@@ -256,7 +256,7 @@
+
+ bin_PROGRAMS = pose
+
+-pose_LDADD = -L/usr/lib -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
++pose_LDADD = -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
+ pose_LDADD += -L./Gzip -lposergzip
+ pose_LDADD += -L./jpeg -lposerjpeg
+
diff --git a/palm/pose/files/patch-ae b/palm/pose/files/patch-ae
new file mode 100644
index 000000000000..5aabfc25290a
--- /dev/null
+++ b/palm/pose/files/patch-ae
@@ -0,0 +1,118 @@
+--- ../SrcUnix/EmTransportSerialUnix.cpp- Mon Jun 19 02:03:59 2000
++++ ../SrcUnix/EmTransportSerialUnix.cpp Mon Jun 19 02:16:39 2000
+@@ -372,9 +372,9 @@
+ EmHostTransportSerial::EmHostTransportSerial (void) :
+ fReadThread (NULL),
+ fWriteThread (NULL),
+- fCommHandle (0),
+- fCommSignalPipeA (0),
+- fCommSignalPipeB (0),
++ fCommHandle (-1),
++ fCommSignalPipeA (-1),
++ fCommSignalPipeB (-1),
+ fTimeToQuit (false),
+ fDataMutex (),
+ fDataCondition (&fDataMutex),
+@@ -402,9 +402,9 @@
+ {
+ assert (fReadThread == NULL);
+ assert (fWriteThread == NULL);
+- assert (fCommHandle == 0);
+- assert (fCommSignalPipeA == 0);
+- assert (fCommSignalPipeB == 0);
++ assert (fCommHandle == -1);
++ assert (fCommSignalPipeA == -1);
++ assert (fCommSignalPipeB == -1);
+ }
+
+
+@@ -440,7 +440,7 @@
+
+ if (fCommHandle <= 0)
+ {
+- fCommHandle = 0;
++ fCommHandle = -1;
+
+ return errno;
+ }
+@@ -470,7 +470,7 @@
+
+ ErrCode EmHostTransportSerial::CreateCommThreads (const EmTransportSerial::ConfigSerial& /*config*/)
+ {
+- if (fCommHandle)
++ if (fCommHandle != -1)
+ {
+ PRINTF ("EmTransportSerial::HostOpen: Creating serial port handler threads...");
+
+@@ -510,35 +510,37 @@
+ {
+ // Signal the threads to quit.
+
+- fDataMutex.lock ();
++ if ( fCommSignalPipeA != -1 && fCommSignalPipeB != -1 ) {
++ fDataMutex.lock ();
+
+- fTimeToQuit = true;
++ fTimeToQuit = true;
+
+- int dummy = 0;
+- write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
++ int dummy = 0;
++ write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
+
+- fDataCondition.broadcast (); // Signals CommWrite.
+- fDataMutex.unlock ();
++ fDataCondition.broadcast (); // Signals CommWrite.
++ fDataMutex.unlock ();
+
+- // Wait for the threads to quit.
++ // Wait for the threads to quit.
+
+- if (fReadThread)
+- {
+- fReadThread->join (NULL);
+- fWriteThread->join (NULL);
+- }
++ if (fReadThread)
++ {
++ fReadThread->join (NULL);
++ fWriteThread->join (NULL);
++ }
+
+- // Thread objects delete themselves, so set our references to NULL.
++ // Thread objects delete themselves, so set our references to NULL.
+
+- fReadThread = NULL;
+- fWriteThread = NULL;
++ fReadThread = NULL;
++ fWriteThread = NULL;
+
+- // Close the signal pipe.
++ // Close the signal pipe.
+
+- close (fCommSignalPipeA);
+- close (fCommSignalPipeB);
++ close (fCommSignalPipeA);
++ close (fCommSignalPipeB);
+
+- fCommSignalPipeA = fCommSignalPipeB = 0;
++ fCommSignalPipeA = fCommSignalPipeB = -1;
++ }
+
+ return errNone;
+ }
+@@ -558,10 +560,11 @@
+
+ ErrCode EmHostTransportSerial::CloseCommPort (void)
+ {
+- int result;
+- result = close (fCommHandle);
++ if ( fCommHandle != -1 ) {
++ int result = close (fCommHandle);
+
+- fCommHandle = 0;
++ fCommHandle = -1;
++ }
+
+ return errNone;
+ }