resolve compile warning in mac book

pull/4/head
yuqing 2015-08-16 10:50:21 +08:00
parent c73278da74
commit f71c846a24
1 changed files with 8 additions and 5 deletions

View File

@ -126,8 +126,10 @@ int process_start(const char* pidFilename)
{ {
pid_t pid; pid_t pid;
int result; int result;
char cmdline[MAX_PATH_SIZE], cmdfile[MAX_PATH_SIZE], argv0[MAX_PATH_SIZE]; char cmdline[MAX_PATH_SIZE];
long cmdsz = sizeof cmdline; char cmdfile[MAX_PATH_SIZE];
char argv0[MAX_PATH_SIZE];
int64_t cmdsz;
if ((result=get_pid_from_file(pidFilename, &pid)) != 0) { if ((result=get_pid_from_file(pidFilename, &pid)) != 0) {
if (result == ENOENT) { if (result == ENOENT) {
@ -140,14 +142,16 @@ int process_start(const char* pidFilename)
return result; return result;
} }
} }
cmdline[cmdsz-1] = argv0[cmdsz-1] = '\0';
if (kill(pid, 0) == 0) { if (kill(pid, 0) == 0) {
cmdsz = sizeof(cmdline);
cmdline[cmdsz-1] = argv0[cmdsz-1] = '\0';
sprintf(cmdfile, "/proc/%d/cmdline", pid); sprintf(cmdfile, "/proc/%d/cmdline", pid);
if ((result=getFileContentEx(cmdfile, cmdline, 0, &cmdsz)) != 0) { if ((result=getFileContentEx(cmdfile, cmdline, 0, &cmdsz)) != 0) {
fprintf(stderr, "read file %s failed. %d %s\n", cmdfile, errno, strerror(errno)); fprintf(stderr, "read file %s failed. %d %s\n", cmdfile, errno, strerror(errno));
return result; return result;
} }
cmdsz = sizeof argv0; cmdsz = sizeof(argv0);
sprintf(cmdfile, "/proc/%d/cmdline", getpid()); sprintf(cmdfile, "/proc/%d/cmdline", getpid());
if ((result=getFileContentEx(cmdfile, argv0, 0, &cmdsz)) != 0) { if ((result=getFileContentEx(cmdfile, argv0, 0, &cmdsz)) != 0) {
fprintf(stderr, "read file %s failed. %d %s\n", cmdfile, errno, strerror(errno)); fprintf(stderr, "read file %s failed. %d %s\n", cmdfile, errno, strerror(errno));
@ -167,7 +171,6 @@ int process_start(const char* pidFilename)
(int)pid, errno, strerror(errno)); (int)pid, errno, strerror(errno));
return result; return result;
} }
} }
int process_exist(const char *pidFilename) int process_exist(const char *pidFilename)