http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=29904
User: gerald
Date: 2009/09/14 11:41 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r29886 | gerald | 2009-09-13 17:38:54 -0700 (Sun, 13 Sep 2009) | 2 lines
Changed paths:
M /trunk/packaging/macosx/dmg_set_style.scpt
M /trunk/packaging/macosx/osx-dmg.sh
M /trunk/packaging/macosx/root.ds_store
M /trunk/packaging/macosx/util.ds_store
Tweak the Finder windows a bit.
------------------------------------------------------------------------
r29903 | gerald | 2009-09-14 11:00:01 -0700 (Mon, 14 Sep 2009) | 2 lines
Changed paths:
M /trunk/packaging/macosx/dmg_set_style.scpt
M /trunk/packaging/macosx/osx-dmg.sh
M /trunk/packaging/macosx/root.ds_store
M /trunk/packaging/macosx/util.ds_store
More Finder tweaks.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r29881 | morriss | 2009-09-13 10:46:10 -0700 (Sun, 13 Sep 2009) | 17 lines
Changed paths:
M /trunk/capture_sync.c
M /trunk/dumpcap.c
Don't use SIGUSR1 to tell dumpcap to exit, use SIGINT: SIGINT is traditionally
used for this purpose and using it also prevents the 2 signals the child gets:
- the user's Ctrl-C (which is sent as a SIGINT to both *shark and its
child dumpcap)
- the signal *shark generates to shut down the child
from colliding (and running 2 signal handlers in the child).
It might be possible for tshark to not send the signal at all when it gets
SIGINT, but it doesn't do any harm now.
Also, do not call g_log() within the signal handler: doing so can cause
aborts (if g_log is being called by the process when the signal comes, the
2nd entrance into g_log is detected as a recursion).
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2767
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/docbook/
Changes Path Action
+6 -0 release-notes.xml Modified
Directory: /trunk-1.2/packaging/macosx/
Changes Path Action
+6 -4 osx-dmg.sh Modified
Directory: /trunk-1.2/
Changes Path Action
+3 -3 capture_sync.c Modified
+17 -38 dumpcap.c Modified