summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-26 14:15:24 (UTC)
committer zecke <zecke>2004-09-26 14:15:24 (UTC)
commit31c049a24effde037c20ed9446d2725f3cb718c3 (patch) (unidiff)
tree3f33fd5ef8ceb057a1066c4f1a09ff5869bde3f4
parent77441b90e9b5a4a23b080e7ac53a512abe96f8a9 (diff)
downloadopie-31c049a24effde037c20ed9446d2725f3cb718c3.zip
opie-31c049a24effde037c20ed9446d2725f3cb718c3.tar.gz
opie-31c049a24effde037c20ed9446d2725f3cb718c3.tar.bz2
Since some 2.6.8 kernel the Linux kernel one can set
the process name with prctl. Let us use this as well
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index fb2ca44..286aed2 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -1,94 +1,102 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2003 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#define QTOPIA_INTERNAL_INITAPP 21#define QTOPIA_INTERNAL_INITAPP
22#include "dropins.h" 22#include "dropins.h"
23 23
24/* OPIE */ 24/* OPIE */
25#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26using namespace Opie::Core; 26using namespace Opie::Core;
27 27
28/* QT */ 28/* QT */
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qstrlist.h> 30#include <qstrlist.h>
31#include <qtimer.h> 31#include <qtimer.h>
32#include <qguardedptr.h> 32#include <qguardedptr.h>
33#include <qcopchannel_qws.h> 33#include <qcopchannel_qws.h>
34 34
35#ifdef private 35#ifdef private
36# undef private 36# undef private
37#endif 37#endif
38#define private public 38#define private public
39#include <qtopia/qpeapplication.h> 39#include <qtopia/qpeapplication.h>
40#undef private 40#undef private
41 41
42/* STD */ 42/* STD */
43#include <stdio.h> 43#include <stdio.h>
44#include <stdlib.h> 44#include <stdlib.h>
45#include <sys/types.h> 45#include <sys/types.h>
46#include <sys/stat.h> 46#include <sys/stat.h>
47
48#ifdef _OS_LINUX_
49#include <sys/prctl.h>
50#ifndef PR_SET_NAME
51#define PR_SET_NAME 15
52#endif
53#endif
54
47#include <unistd.h> 55#include <unistd.h>
48 56
49 57
50using QuickPrivate::PluginLoader; 58using QuickPrivate::PluginLoader;
51 59
52static QPEApplication *app = 0; 60static QPEApplication *app = 0;
53static PluginLoader *loader = 0; 61static PluginLoader *loader = 0;
54static ApplicationInterface *appIface = 0; 62static ApplicationInterface *appIface = 0;
55static QGuardedPtr<QWidget> mainWindow; 63static QGuardedPtr<QWidget> mainWindow;
56 64
57#ifdef _OS_LINUX_ 65#ifdef _OS_LINUX_
58static char **argv0 = 0; 66static char **argv0 = 0;
59static int argv_lth; 67static int argv_lth;
60extern char **environ; 68extern char **environ;
61#ifndef SPT_BUFSIZE 69#ifndef SPT_BUFSIZE
62#define SPT_BUFSIZE 2048 70#define SPT_BUFSIZE 2048
63#endif 71#endif
64#include <stdarg.h> 72#include <stdarg.h>
65void setproctitle (const char *fmt,...) { 73void setproctitle (const char *fmt,...) {
66 int i; 74 int i;
67 char buf[SPT_BUFSIZE]; 75 char buf[SPT_BUFSIZE];
68 va_list ap; 76 va_list ap;
69 77
70 if (!argv0) 78 if (!argv0)
71 return; 79 return;
72 80
73 va_start(ap, fmt); 81 va_start(ap, fmt);
74 (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap); 82 (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap);
75 va_end(ap); 83 va_end(ap);
76 84
77 i = strlen (buf); 85 i = strlen (buf);
78 if (i > argv_lth - 2) { 86 if (i > argv_lth - 2) {
79 i = argv_lth - 2; 87 i = argv_lth - 2;
80 buf[i] = '\0'; 88 buf[i] = '\0';
81 } 89 }
82 90
83 memset(argv0[0], '\0', argv_lth); /* clear the memory area */ 91 memset(argv0[0], '\0', argv_lth); /* clear the memory area */
84 (void) strcpy (argv0[0], buf); 92 (void) strcpy (argv0[0], buf);
85 93
86 argv0[1] = NULL; 94 argv0[1] = NULL;
87} 95}
88#endif 96#endif
89 97
90 98
91class QuickLauncher : public QObject 99class QuickLauncher : public QObject
92{ 100{
93 Q_OBJECT 101 Q_OBJECT
94public: 102public:
@@ -121,96 +129,97 @@ public:
121 } 129 }
122 } else { 130 } else {
123 owarn << "Could not create application main window" << oendl; 131 owarn << "Could not create application main window" << oendl;
124 exit(-1); 132 exit(-1);
125 } 133 }
126 } 134 }
127 135
128private slots: 136private slots:
129 void message(const QCString &msg, const QByteArray & data) 137 void message(const QCString &msg, const QByteArray & data)
130 { 138 {
131 QStrList argList; 139 QStrList argList;
132 140
133 if ( msg == "execute(QStrList)" ) { 141 if ( msg == "execute(QStrList)" ) {
134 delete qlChannel; 142 delete qlChannel;
135 QDataStream stream( data, IO_ReadOnly ); 143 QDataStream stream( data, IO_ReadOnly );
136 QStrList argList; 144 QStrList argList;
137 stream >> argList; 145 stream >> argList;
138 odebug << "QuickLauncher execute: " << argList.at(0) << oendl; 146 odebug << "QuickLauncher execute: " << argList.at(0) << oendl;
139 doQuickLaunch( argList ); 147 doQuickLaunch( argList );
140 delete this; 148 delete this;
141 } else if ( msg == "execute(QString)" ) { 149 } else if ( msg == "execute(QString)" ) {
142 delete qlChannel; 150 delete qlChannel;
143 QDataStream stream( data, IO_ReadOnly ); 151 QDataStream stream( data, IO_ReadOnly );
144 QString arg; 152 QString arg;
145 stream >> arg; 153 stream >> arg;
146 odebug << "QuickLauncher execute: " << arg << oendl; 154 odebug << "QuickLauncher execute: " << arg << oendl;
147 QStrList argList; 155 QStrList argList;
148 argList.append( arg.utf8() ); 156 argList.append( arg.utf8() );
149 doQuickLaunch( argList ); 157 doQuickLaunch( argList );
150 delete this; 158 delete this;
151 } 159 }
152 } 160 }
153 161
154private: 162private:
155 void doQuickLaunch( QStrList &argList ) 163 void doQuickLaunch( QStrList &argList )
156 { 164 {
157 static int myargc = argList.count(); 165 static int myargc = argList.count();
158 static char **myargv = new char *[myargc + 1]; 166 static char **myargv = new char *[myargc + 1];
159 167
160 for ( int j = 0; j < myargc; j++ ) { 168 for ( int j = 0; j < myargc; j++ ) {
161 myargv[j] = new char [strlen(argList.at(j))+1]; 169 myargv[j] = new char [strlen(argList.at(j))+1];
162 strcpy( myargv[j], argList.at(j) ); 170 strcpy( myargv[j], argList.at(j) );
163 } 171 }
164 172
165 myargv[myargc] = NULL; 173 myargv[myargc] = NULL;
166#ifdef _OS_LINUX_ 174#ifdef _OS_LINUX_
167 // Change name of process 175 // Change name of process
168 setproctitle(myargv[0]); 176 setproctitle(myargv[0]);
177 prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 );
169#endif 178#endif
170 179
171 connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); 180 connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
172 app->exit_loop(); 181 app->exit_loop();
173 app->initApp( myargc, myargv ); 182 app->initApp( myargc, myargv );
174 exec( myargc, myargv ); 183 exec( myargc, myargv );
175 } 184 }
176 185
177private: 186private:
178 QCopChannel *qlChannel; 187 QCopChannel *qlChannel;
179}; 188};
180 189
181int main( int argc, char** argv ) 190int main( int argc, char** argv )
182{ 191{
183 app = new QPEApplication( argc, argv ); 192 app = new QPEApplication( argc, argv );
184 193
185 loader = new PluginLoader( "application" ); 194 loader = new PluginLoader( "application" );
186 195
187 unsetenv( "LD_BIND_NOW" ); 196 unsetenv( "LD_BIND_NOW" );
188 197
189 QCString arg0 = argv[0]; 198 QCString arg0 = argv[0];
190 int sep = arg0.findRev( '/' ); 199 int sep = arg0.findRev( '/' );
191 200
192 if ( sep > 0 ) 201 if ( sep > 0 )
193 arg0 = arg0.mid( sep+1 ); 202 arg0 = arg0.mid( sep+1 );
194 203
195 if ( arg0 != "quicklauncher" ) { 204 if ( arg0 != "quicklauncher" ) {
196 odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; 205 odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
197 QuickLauncher::exec( argc, argv ); 206 QuickLauncher::exec( argc, argv );
198 } else { 207 } else {
199#ifdef _OS_LINUX_ 208#ifdef _OS_LINUX_
200 // Setup to change proc title 209 // Setup to change proc title
201 int i; 210 int i;
202 char **envp = environ; 211 char **envp = environ;
203 /* Move the environment so we can reuse the memory. 212 /* Move the environment so we can reuse the memory.
204 * (Code borrowed from sendmail.) */ 213 * (Code borrowed from sendmail.) */
205 for (i = 0; envp[i] != NULL; i++) 214 for (i = 0; envp[i] != NULL; i++)
206 continue; 215 continue;
207 environ = (char **) malloc(sizeof(char *) * (i + 1)); 216 environ = (char **) malloc(sizeof(char *) * (i + 1));
208 if (environ == NULL) 217 if (environ == NULL)
209 return -1; 218 return -1;
210 for (i = 0; envp[i] != NULL; i++) 219 for (i = 0; envp[i] != NULL; i++)
211 if ((environ[i] = strdup(envp[i])) == NULL) 220 if ((environ[i] = strdup(envp[i])) == NULL)
212 return -1; 221 return -1;
213 environ[i] = NULL; 222 environ[i] = NULL;
214 223
215 argv0 = argv; 224 argv0 = argv;
216 if (i > 0) 225 if (i > 0)