author | zecke <zecke> | 2004-10-10 16:43:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-10 16:43:49 (UTC) |
commit | 81133e613b12ca0b5fa4aa03c0a3441f1e41b1ad (patch) (unidiff) | |
tree | 897c5742c1e5ba8444ef4807ad6b64c62287e351 | |
parent | 96e6046ac26725836d38832a6e3a491351deeb53 (diff) | |
download | opie-81133e613b12ca0b5fa4aa03c0a3441f1e41b1ad.zip opie-81133e613b12ca0b5fa4aa03c0a3441f1e41b1ad.tar.gz opie-81133e613b12ca0b5fa4aa03c0a3441f1e41b1ad.tar.bz2 |
Do not 'spawn' a shell this way. Use OProcess::setUseShell if you really
need to start the command via a shell.
These scripts should be marked as executable and have !#/bin/sh in the
header, this should be enough for the kernel to launch them via sh.
-rw-r--r-- | noncore/apps/opie-console/fixit.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/fixit.cpp b/noncore/apps/opie-console/fixit.cpp index 5ac7673..57dba4c 100644 --- a/noncore/apps/opie-console/fixit.cpp +++ b/noncore/apps/opie-console/fixit.cpp | |||
@@ -52,47 +52,43 @@ FixIt::FixIt() : QObject() { | |||
52 | * one is that pppd is listening on our port... | 52 | * one is that pppd is listening on our port... |
53 | * we've to stop it from that and then do kill(SIGHUP,1); | 53 | * we've to stop it from that and then do kill(SIGHUP,1); |
54 | */ | 54 | */ |
55 | void FixIt::fixIt() { | 55 | void FixIt::fixIt() { |
56 | #ifndef EAST | 56 | #ifndef EAST |
57 | ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" ); | 57 | ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" ); |
58 | QFile file( "/etc/inittab" ); | 58 | QFile file( "/etc/inittab" ); |
59 | if ( file.open(IO_WriteOnly | IO_Raw ) ) { | 59 | if ( file.open(IO_WriteOnly | IO_Raw ) ) { |
60 | file.writeBlock(m_file,strlen(m_file) ); | 60 | file.writeBlock(m_file,strlen(m_file) ); |
61 | } | 61 | } |
62 | file.close(); | 62 | file.close(); |
63 | ::kill( SIGHUP, 1 ); | 63 | ::kill( SIGHUP, 1 ); |
64 | 64 | ||
65 | #else | 65 | #else |
66 | 66 | ||
67 | OProcess m_kill; | 67 | OProcess m_kill; |
68 | m_kill << "sh"; | 68 | m_kill << QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh"; |
69 | m_kill << "-c"; | ||
70 | m_kill << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh"); | ||
71 | 69 | ||
72 | 70 | ||
73 | if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) { | 71 | if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) { |
74 | owarn << "could not execute kill script" << oendl; | 72 | owarn << "could not execute kill script" << oendl; |
75 | } else { | 73 | } else { |
76 | Global::statusMessage( tr("Fixing up Embedix")); | 74 | Global::statusMessage( tr("Fixing up Embedix")); |
77 | } | 75 | } |
78 | 76 | ||
79 | #endif | 77 | #endif |
80 | } | 78 | } |
81 | 79 | ||
82 | void FixIt::breakIt() { | 80 | void FixIt::breakIt() { |
83 | #ifdef EAST | 81 | #ifdef EAST |
84 | OProcess m_restart; | 82 | OProcess m_restart; |
85 | m_restart << "sh"; | 83 | m_restart << QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_restart_0_1.sh"; |
86 | m_restart << "-c"; | ||
87 | m_restart << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_restart_0_1.sh"); | ||
88 | 84 | ||
89 | 85 | ||
90 | if ( !m_restart.start() ) { | 86 | if ( !m_restart.start(OProcess::DontCare,OProcess::NoCommunication) ) { |
91 | owarn << "could not execute restart script" << oendl; | 87 | owarn << "could not execute restart script" << oendl; |
92 | } | 88 | } |
93 | 89 | ||
94 | #endif | 90 | #endif |
95 | } | 91 | } |
96 | 92 | ||
97 | 93 | ||
98 | #endif | 94 | #endif |