Update [kinit wrapper] -> [tdeinit wrapper].

pull/16/head
Darrell Anderson 11 years ago
parent 7e397d203c
commit 931f86e56b

@ -146,12 +146,12 @@ static int openSocket()
{ {
if (!home_dir || !home_dir[0]) if (!home_dir || !home_dir[0])
{ {
fprintf(stderr, "[kinit wrapper] Warning: $HOME not set!\n"); fprintf(stderr, "[tdeinit wrapper] Warning: $HOME not set!\n");
return -1; return -1;
} }
if (strlen(home_dir) > (MAX_SOCK_FILE-100)) if (strlen(home_dir) > (MAX_SOCK_FILE-100))
{ {
fprintf(stderr, "[kinit wrapper] Warning: Home directory path too long!\n"); fprintf(stderr, "[tdeinit wrapper] Warning: Home directory path too long!\n");
return -1; return -1;
} }
kde_home++; kde_home++;
@ -168,7 +168,7 @@ static int openSocket()
strncat(sock_file, getenv("XAUTHLOCALHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1); strncat(sock_file, getenv("XAUTHLOCALHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1);
else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0) else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
{ {
perror("[kinit wrapper] Warning: Could not determine hostname: "); perror("[tdeinit wrapper] Warning: Could not determine hostname: ");
return -1; return -1;
} }
sock_file[sizeof(sock_file)-1] = '\0'; sock_file[sizeof(sock_file)-1] = '\0';
@ -177,13 +177,13 @@ static int openSocket()
display = getDisplay(); display = getDisplay();
if (display == NULL) if (display == NULL)
{ {
fprintf(stderr, "[kinit wrapper] Error: Could not determine display.\n"); fprintf(stderr, "[tdeinit wrapper] Error: Could not determine display.\n");
return -1; return -1;
} }
if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE) if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
{ {
fprintf(stderr, "[kinit wrapper] Warning: Socket name will be too long.\n"); fprintf(stderr, "[tdeinit wrapper] Warning: Socket name will be too long.\n");
free (display); free (display);
return -1; return -1;
} }
@ -193,7 +193,7 @@ static int openSocket()
if (strlen(sock_file) >= sizeof(server.sun_path)) if (strlen(sock_file) >= sizeof(server.sun_path))
{ {
fprintf(stderr, "[kinit wrapper] Warning: Path of socket file exceeds UNIX_PATH_MAX.\n"); fprintf(stderr, "[tdeinit wrapper] Warning: Path of socket file exceeds UNIX_PATH_MAX.\n");
return -1; return -1;
} }
@ -203,7 +203,7 @@ static int openSocket()
s = socket(PF_UNIX, SOCK_STREAM, 0); s = socket(PF_UNIX, SOCK_STREAM, 0);
if (s < 0) if (s < 0)
{ {
perror("[kinit wrapper] Warning: socket creation failed: "); perror("[tdeinit wrapper] Warning: socket creation failed: ");
return -1; return -1;
} }
@ -212,7 +212,7 @@ static int openSocket()
socklen = sizeof(server); socklen = sizeof(server);
if(connect(s, (struct sockaddr *)&server, socklen) == -1) if(connect(s, (struct sockaddr *)&server, socklen) == -1)
{ {
perror("[kinit wrapper] Warning: socket connection failed: "); perror("[tdeinit wrapper] Warning: socket connection failed: ");
close(s); close(s);
return -1; return -1;
} }
@ -340,14 +340,14 @@ int main(int argc, char **argv)
{ {
if( argc > 1) if( argc > 1)
{ {
fprintf(stderr, "[kinit wrapper] Usage: %s\n\n", start); fprintf(stderr, "[tdeinit wrapper] Usage: %s\n\n", start);
fprintf(stderr, "[kinit wrapper] Shuts down tdeinit master process and terminates all processes spawned from it.\n"); fprintf(stderr, "[tdeinit wrapper] Shuts down tdeinit master process and terminates all processes spawned from it.\n");
exit( 255 ); exit( 255 );
} }
sock = openSocket(); sock = openSocket();
if( sock < 0 ) if( sock < 0 )
{ {
fprintf( stderr, "[kinit wrapper] Error: Can't contact tdeinit!\n" ); fprintf( stderr, "[tdeinit wrapper] Error: Can't contact tdeinit!\n" );
exit( 255 ); exit( 255 );
} }
header.cmd = LAUNCHER_TERMINATE_KDE; header.cmd = LAUNCHER_TERMINATE_KDE;
@ -362,7 +362,7 @@ int main(int argc, char **argv)
argc--; argc--;
if (argc < 1) if (argc < 1)
{ {
fprintf(stderr, "[kinit wrapper] Usage: %s <application> [<args>]\n", start); fprintf(stderr, "[tdeinit wrapper] Usage: %s <application> [<args>]\n", start);
exit(255); /* usage should be documented somewhere ... */ exit(255); /* usage should be documented somewhere ... */
} }
start = argv[0]; start = argv[0];
@ -372,7 +372,7 @@ int main(int argc, char **argv)
if( sock < 0 ) /* couldn't contact tdeinit, start argv[ 0 ] directly */ if( sock < 0 ) /* couldn't contact tdeinit, start argv[ 0 ] directly */
{ {
execvp( argv[ 0 ], argv ); execvp( argv[ 0 ], argv );
fprintf( stderr, "[kinit wrapper] Error: Can't run %s !\n", argv[ 0 ] ); fprintf( stderr, "[tdeinit wrapper] Error: Can't run %s !\n", argv[ 0 ] );
exit( 255 ); exit( 255 );
} }
@ -448,7 +448,7 @@ int main(int argc, char **argv)
buffer = (char *) malloc(size); buffer = (char *) malloc(size);
if (buffer == NULL) if (buffer == NULL)
{ {
fprintf(stderr, "[kinit wrapper] Error: malloc() failed."); fprintf(stderr, "[tdeinit wrapper] Error: malloc() failed.");
exit(255); exit(255);
} }
p = buffer; p = buffer;
@ -505,7 +505,7 @@ int main(int argc, char **argv)
if( p - buffer != size ) /* should fail only if you change this source and do */ if( p - buffer != size ) /* should fail only if you change this source and do */
/* a stupid mistake, it should be assert() actually */ /* a stupid mistake, it should be assert() actually */
{ {
fprintf(stderr, "[kinit wrapper] Oops. Invalid format.\n"); fprintf(stderr, "[tdeinit wrapper] Oops. Invalid format.\n");
exit(255); exit(255);
} }
@ -514,7 +514,7 @@ int main(int argc, char **argv)
if (read_socket(sock, (char *) &header, sizeof(header))==-1) if (read_socket(sock, (char *) &header, sizeof(header))==-1)
{ {
fprintf(stderr, "[kinit wrapper] Communication error.\n"); fprintf(stderr, "[tdeinit wrapper] Communication error.\n");
exit(255); exit(255);
} }
@ -524,7 +524,7 @@ int main(int argc, char **argv)
buffer = (char *) malloc(header.arg_length); buffer = (char *) malloc(header.arg_length);
if (buffer == NULL) if (buffer == NULL)
{ {
fprintf(stderr, "[kinit wrapper] Error: malloc() failed\n"); fprintf(stderr, "[tdeinit wrapper] Error: malloc() failed\n");
exit(255); exit(255);
} }
read_socket(sock, buffer, header.arg_length); read_socket(sock, buffer, header.arg_length);
@ -534,12 +534,12 @@ int main(int argc, char **argv)
} }
else if (header.cmd == LAUNCHER_ERROR) else if (header.cmd == LAUNCHER_ERROR)
{ {
fprintf(stderr, "[kinit wrapper] Could not launch '%s'.\n", start); fprintf(stderr, "[tdeinit wrapper] Could not launch '%s'.\n", start);
exit(255); exit(255);
} }
else else
{ {
fprintf(stderr, "[kinit wrapper] Unexpected response (response = %ld).\n", header.cmd); fprintf(stderr, "[tdeinit wrapper] Unexpected response (response = %ld).\n", header.cmd);
exit(255); exit(255);
} }
exit(0); exit(0);

Loading…
Cancel
Save