Author: aschnell Date: Fri Aug 8 14:57:40 2008 New Revision: 49869 URL: http://svn.opensuse.org/viewcvs/yast?rev=49869&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/StorageDefines.h Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=49869&r1=49868&r2=49869&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Fri Aug 8 14:57:40 2008 @@ -15,6 +15,7 @@ #include "y2storage/Storage.h" #include "y2storage/OutputProcessor.h" #include "y2storage/Dasd.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -35,7 +36,7 @@ bool Dasd::detectPartitionsFdasd( ProcPart& ppart ) { bool ret = true; - string cmd_line = "/sbin/fdasd -p " + quote(device()); + string cmd_line = FDASDBIN " -p " + quote(device()); system_stderr.erase(); y2milestone( "executing cmd:%s", cmd_line.c_str() ); SystemCmd Cmd( cmd_line ); @@ -49,7 +50,7 @@ bool Dasd::detectPartitions( ProcPart& ppart ) { bool ret = true; - string cmd_line = "dasdview -x " + quote(device()); + string cmd_line = DASDVIEWBIN " -x " + quote(device()); system_stderr.erase(); detected_label = "dasd"; setLabelData( "dasd" ); @@ -381,7 +382,7 @@ ++i; } inpfile.close(); - string cmd_line = "/sbin/fdasd -c " + inpname + " " + quote(device()); + string cmd_line = FDASDBIN " -c " + inpname + " " + quote(device()); if( execCheckFailed( cmd_line ) ) { SystemCmd cmd( "cat " + inpname ); @@ -551,8 +552,7 @@ normalizeDevice(*i); *i = "-f " + *i; } - string cmd_line = "dasdfmt -Y -P 4 -b 4096 -y -m 1 -d cdl " + - mergeString(devs); + string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + quote(devs); y2milestone( "cmdline:%s", cmd_line.c_str() ); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); ScrollBarHandler* sb = new DasdfmtScrollbar( cb ); @@ -647,6 +647,3 @@ return( s ); } } - - - Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDefines.h?rev=49869&r1=49868&r2=49869&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Fri Aug 8 14:57:40 2008 @@ -38,5 +38,9 @@ #define DDBIN "/bin/dd" +#define DASDFMTBIN "/sbin/dasdfmt" +#define DASDVIEWBIN "/sbin/dasdview" +#define FDASDBIN "/sbin/fdasd" + #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org