From 73d4b58ec5f958fc7ed905cc3b79992fda716bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 22 Aug 2006 23:38:19 +0000 Subject: [PATCH] * Renamed ZipOMaticZipper.cpp|h to ZipperThread.cpp|h like the only class it contains. * Joined the resource files together, updated version info. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18575 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/tracker/zipomatic/Jamfile | 11 +-- .../tracker/zipomatic/ZipOMatic.icons.rdef | 59 --------------- src/add-ons/tracker/zipomatic/ZipOMatic.rdef | 75 ++++++++++++++++++- .../tracker/zipomatic/ZipOMatic.version.rdef | 20 ----- .../{ZipOMaticZipper.cpp => ZipperThread.cpp} | 9 ++- .../{ZipOMaticZipper.h => ZipperThread.h} | 0 6 files changed, 82 insertions(+), 92 deletions(-) delete mode 100644 src/add-ons/tracker/zipomatic/ZipOMatic.icons.rdef delete mode 100644 src/add-ons/tracker/zipomatic/ZipOMatic.version.rdef rename src/add-ons/tracker/zipomatic/{ZipOMaticZipper.cpp => ZipperThread.cpp} (98%) rename src/add-ons/tracker/zipomatic/{ZipOMaticZipper.h => ZipperThread.h} (100%) diff --git a/src/add-ons/tracker/zipomatic/Jamfile b/src/add-ons/tracker/zipomatic/Jamfile index 02cf245188..3b56e08224 100644 --- a/src/add-ons/tracker/zipomatic/Jamfile +++ b/src/add-ons/tracker/zipomatic/Jamfile @@ -1,9 +1,5 @@ SubDir HAIKU_TOP src add-ons tracker zipomatic ; -AddResources ZipOMatic-Z : - ZipOMatic.rdef ZipOMatic.icons.rdef ZipOMatic.version.rdef - ; - Application ZipOMatic-Z : GenericThread.cpp ZipOMatic.cpp @@ -12,7 +8,8 @@ Application ZipOMatic-Z : ZipOMaticSettings.cpp ZipOMaticView.cpp ZipOMaticWindow.cpp - ZipOMaticZipper.cpp - ; + ZipperThread.cpp -LinkAgainst ZipOMatic-Z : be tracker ; + : be tracker + : ZipOMatic.rdef +; diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.icons.rdef b/src/add-ons/tracker/zipomatic/ZipOMatic.icons.rdef deleted file mode 100644 index 4cd4d2e3ab..0000000000 --- a/src/add-ons/tracker/zipomatic/ZipOMatic.icons.rdef +++ /dev/null @@ -1,59 +0,0 @@ -/* -** ZipOMatic.icons.rdef -** -*/ - -resource large_icon array { - $"FFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFF00FAFAFAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFF00FAFAFAFAFAFA5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFF00FAFAFAFAFA5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFF003FF9F9FA5D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFF007D3FF9F9F95D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFF007D7D3FF9F9F95D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FF003F3F7D3FF9F9F95D5D5D00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFF00F93F3FF9F9F95D5D5D0000D9D90000FFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFF00F9F93FF9F9F95D5D7D7D7D0000D9D90000FFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFF00F9F9F9F9F93F3F7D7D7D00D9D9D9D9D90000FFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFF00F9F9F9F9F9F93F7D00D9D9D9D9D9D900D90000FFFFFFFFFFFFFFFF" - $"FFFFFFFF00F9F9F9F9F9F90000D9D900D9D9D900D9D9D9D90000FFFFFFFFFFFF" - $"FFFFFFFFFF00F9F9F9F900D9D9D9D900D9D900D9D9D9D9D9D9D90000FFFFFFFF" - $"FFFFFFFF00D900F90000000000000000D900D9D9D9D9D9D9D9D9D9D900FFFFFF" - $"FFFFFF00D9D9D900D9000000D9D9000000D9D9D9D9D9D9D9D9D9D9D9D900FFFF" - $"FFFF00D9D9D9D9D9D900D9D90000D900000000000000D9D9D9D9D9D9D9D900FF" - $"FF00D9D9D9D9D9D9D9D9000000D9000000D9D9D9D9D900D9D9D9D9D9D98300FF" - $"FF00D9D9D9D9D9D9D9D9D9D9D900D9D90000D9D90000D9D9D9D9D9D9838300FF" - $"00D9D9D9D9D9D9D9D9D9D9D900D9D900D900000000D9D9D9D9D9D983838300FF" - $"00D9D9D9D9D9D9D9D9D9D900D9D9D900D9D9D9D9D90000D9D9D98383838300FF" - $"00D9D9D9D9D9D9D9D9D900D9D9D9D9D9D9D9D9D9D9D9D900008383838300FFFF" - $"FF00D9D9D9D9D9D9D900D9D9D9D9D9D9D9D9D9D9D9D9D9D90083838300FFFFFF" - $"FFFF0000D9D9D9D9D901D9D9D9D9D9D9D9D9D9D9D9D9D98300838300FFFFFFFF" - $"FFFFFFFF0000D9D9D901D9D9D9D9D9D9D9D9D9D9D9D98383008300FFFFFFFFFF" - $"FFFFFFFFFFFF0000D900D9D9D9D9D9D9D9D9D9D9D98383830000FFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFF0000D9D9D9D9D9D9D9D9D9D98383838300FFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFF0000D9D9D9D9D9D9D98383838301FFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFF0000D9D9D9D98383838301FFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000D9D983830100FFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" -}; - -resource mini_icon array { - $"FFFFFFFF000000FFFFFFFFFFFFFFFFFF" - $"FFFFFF00FAFA5D00FFFFFFFFFFFFFFFF" - $"FFFF003F3F3F5D00FFFFFFFFFFFFFFFF" - $"FFFF003FF9F95D0000FFFFFFFFFFFFFF" - $"FF00003FF9F95D00D90000FFFFFFFFFF" - $"007D003FF9F95D7D00D9000000FFFFFF" - $"3F00F9F9F9F93F008300D9D9D90000FF" - $"3F0000F9F9F90000000000D9D9D98300" - $"00D9D900F900000083D9D900D93F8300" - $"00D93FD900830000000000D93F838300" - $"00D9D9D9D900D900D9D9D901008300FF" - $"0000D9D9003FD900D9D93F830000FFFF" - $"FFFF000000D9D93FD93F838300FFFFFF" - $"FFFFFFFF0000D9D9D9838301FFFFFFFF" - $"FFFFFFFFFFFF0000D98301FFFFFFFFFF" - $"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFF" -}; - diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.rdef b/src/add-ons/tracker/zipomatic/ZipOMatic.rdef index 52143e4291..548947b3ef 100644 --- a/src/add-ons/tracker/zipomatic/ZipOMatic.rdef +++ b/src/add-ons/tracker/zipomatic/ZipOMatic.rdef @@ -1,12 +1,81 @@ /* -** ZipOMatic.rdef -** -*/ + * ZipOMatic.rdef + */ resource app_signature "application/x-vnd.obos.zip-o-matic"; resource app_flags B_SINGLE_LAUNCH; +resource app_version { + major = 1, + middle = 0, + minor = 0, + + /* 0 = development 1 = alpha 2 = beta + 3 = gamma 4 = golden master 5 = final */ + variety = 0, + + internal = 1, + + short_info = "ZipOMatic", + long_info = "ZipOMatic, Copyright 2003-2006 Haiku Inc." +}; + resource file_types message { "types" = "application/octet-stream" }; + +resource large_icon array { + $"FFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFF00FAFAFAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFF00FAFAFAFAFAFA5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFF00FAFAFAFAFA5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFF003FF9F9FA5D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF007D3FF9F9F95D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFF007D7D3FF9F9F95D5D5D00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF003F3F7D3FF9F9F95D5D5D00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFF00F93F3FF9F9F95D5D5D0000D9D90000FFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFF00F9F93FF9F9F95D5D7D7D7D0000D9D90000FFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF00F9F9F9F9F93F3F7D7D7D00D9D9D9D9D90000FFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFF00F9F9F9F9F9F93F7D00D9D9D9D9D9D900D90000FFFFFFFFFFFFFFFF" + $"FFFFFFFF00F9F9F9F9F9F90000D9D900D9D9D900D9D9D9D90000FFFFFFFFFFFF" + $"FFFFFFFFFF00F9F9F9F900D9D9D9D900D9D900D9D9D9D9D9D9D90000FFFFFFFF" + $"FFFFFFFF00D900F90000000000000000D900D9D9D9D9D9D9D9D9D9D900FFFFFF" + $"FFFFFF00D9D9D900D9000000D9D9000000D9D9D9D9D9D9D9D9D9D9D9D900FFFF" + $"FFFF00D9D9D9D9D9D900D9D90000D900000000000000D9D9D9D9D9D9D9D900FF" + $"FF00D9D9D9D9D9D9D9D9000000D9000000D9D9D9D9D900D9D9D9D9D9D98300FF" + $"FF00D9D9D9D9D9D9D9D9D9D9D900D9D90000D9D90000D9D9D9D9D9D9838300FF" + $"00D9D9D9D9D9D9D9D9D9D9D900D9D900D900000000D9D9D9D9D9D983838300FF" + $"00D9D9D9D9D9D9D9D9D9D900D9D9D900D9D9D9D9D90000D9D9D98383838300FF" + $"00D9D9D9D9D9D9D9D9D900D9D9D9D9D9D9D9D9D9D9D9D900008383838300FFFF" + $"FF00D9D9D9D9D9D9D900D9D9D9D9D9D9D9D9D9D9D9D9D9D90083838300FFFFFF" + $"FFFF0000D9D9D9D9D901D9D9D9D9D9D9D9D9D9D9D9D9D98300838300FFFFFFFF" + $"FFFFFFFF0000D9D9D901D9D9D9D9D9D9D9D9D9D9D9D98383008300FFFFFFFFFF" + $"FFFFFFFFFFFF0000D900D9D9D9D9D9D9D9D9D9D9D98383830000FFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFF0000D9D9D9D9D9D9D9D9D9D98383838300FFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFF0000D9D9D9D9D9D9D98383838301FFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFF0000D9D9D9D98383838301FFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000D9D983830100FFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +}; + +resource mini_icon array { + $"FFFFFFFF000000FFFFFFFFFFFFFFFFFF" + $"FFFFFF00FAFA5D00FFFFFFFFFFFFFFFF" + $"FFFF003F3F3F5D00FFFFFFFFFFFFFFFF" + $"FFFF003FF9F95D0000FFFFFFFFFFFFFF" + $"FF00003FF9F95D00D90000FFFFFFFFFF" + $"007D003FF9F95D7D00D9000000FFFFFF" + $"3F00F9F9F9F93F008300D9D9D90000FF" + $"3F0000F9F9F90000000000D9D9D98300" + $"00D9D900F900000083D9D900D93F8300" + $"00D93FD900830000000000D93F838300" + $"00D9D9D9D900D900D9D9D901008300FF" + $"0000D9D9003FD900D9D93F830000FFFF" + $"FFFF000000D9D93FD93F838300FFFFFF" + $"FFFFFFFF0000D9D9D9838301FFFFFFFF" + $"FFFFFFFFFFFF0000D98301FFFFFFFFFF" + $"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFF" +}; + diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.version.rdef b/src/add-ons/tracker/zipomatic/ZipOMatic.version.rdef deleted file mode 100644 index 178c8ca12f..0000000000 --- a/src/add-ons/tracker/zipomatic/ZipOMatic.version.rdef +++ /dev/null @@ -1,20 +0,0 @@ -/* -** ZipOMatic.version.rdef -** -*/ - -resource app_version { - - major = 1, - middle = 0, - minor = 0, - - /* 0 = development 1 = alpha 2 = beta - 3 = gamma 4 = golden master 5 = final */ - variety = 0, - - internal = 1, - - short_info = "R1.0.0d1", - long_info = "OpenBeOS 1.0.0d1 ©2003 OpenBeOS Project" -}; diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp b/src/add-ons/tracker/zipomatic/ZipperThread.cpp similarity index 98% rename from src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp rename to src/add-ons/tracker/zipomatic/ZipperThread.cpp index 904e4338d1..ea31c9939a 100644 --- a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp +++ b/src/add-ons/tracker/zipomatic/ZipperThread.cpp @@ -294,9 +294,12 @@ ZipperThread::_PipeCommand(int argc, const char** argv, int& in, int& out, thread = errno; // Restore old FDs - close(STDIN_FILENO); dup(oldIn); close(oldIn); - close(STDOUT_FILENO); dup(oldOut); close(oldOut); - close(STDERR_FILENO); dup(oldErr); close(oldErr); + dup2(oldIn, STDIN_FILENO); + close(oldIn); + dup2(oldOut, STDOUT_FILENO); + close(oldOut); + dup2(oldErr, STDERR_FILENO); + close(oldErr); return thread; err3: diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.h b/src/add-ons/tracker/zipomatic/ZipperThread.h similarity index 100% rename from src/add-ons/tracker/zipomatic/ZipOMaticZipper.h rename to src/add-ons/tracker/zipomatic/ZipperThread.h