|
@@ -64,7 +64,7 @@ tv_udiff(struct timeval *start, struct timeval *end)
|
|
|
long secdiff = end->tv_sec - start->tv_sec;
|
|
|
|
|
|
if (secdiff+1 > LONG_MAX/1000000) {
|
|
|
- log_fn(LOG_WARNING, "comparing times too far apart.");
|
|
|
+ log_fn(LOG_WARN, "comparing times too far apart.");
|
|
|
return LONG_MAX;
|
|
|
}
|
|
|
|
|
@@ -335,17 +335,17 @@ int check_private_dir(const char *dirname, int create)
|
|
|
struct stat st;
|
|
|
if (stat(dirname, &st)) {
|
|
|
if (errno != ENOENT) {
|
|
|
- log(LOG_WARNING, "Directory %s cannot be read: %s", dirname,
|
|
|
+ log(LOG_WARN, "Directory %s cannot be read: %s", dirname,
|
|
|
strerror(errno));
|
|
|
return -1;
|
|
|
}
|
|
|
if (!create) {
|
|
|
- log(LOG_WARNING, "Directory %s does not exist.", dirname);
|
|
|
+ log(LOG_WARN, "Directory %s does not exist.", dirname);
|
|
|
return -1;
|
|
|
}
|
|
|
log(LOG_INFO, "Creating directory %s", dirname);
|
|
|
if (mkdir(dirname, 0700)) {
|
|
|
- log(LOG_WARNING, "Error creating directory %s: %s", dirname,
|
|
|
+ log(LOG_WARN, "Error creating directory %s: %s", dirname,
|
|
|
strerror(errno));
|
|
|
return -1;
|
|
|
} else {
|
|
@@ -353,17 +353,17 @@ int check_private_dir(const char *dirname, int create)
|
|
|
}
|
|
|
}
|
|
|
if (!(st.st_mode & S_IFDIR)) {
|
|
|
- log(LOG_WARNING, "%s is not a directory", dirname);
|
|
|
+ log(LOG_WARN, "%s is not a directory", dirname);
|
|
|
return -1;
|
|
|
}
|
|
|
if (st.st_uid != getuid()) {
|
|
|
- log(LOG_WARNING, "%s is not owned by this UID (%d)", dirname, getuid());
|
|
|
+ log(LOG_WARN, "%s is not owned by this UID (%d)", dirname, getuid());
|
|
|
return -1;
|
|
|
}
|
|
|
if (st.st_mode & 0077) {
|
|
|
- log(LOG_WARNING, "Fixing permissions on directory %s", dirname);
|
|
|
+ log(LOG_WARN, "Fixing permissions on directory %s", dirname);
|
|
|
if (chmod(dirname, 0700)) {
|
|
|
- log(LOG_WARNING, "Could not chmod directory %s: %s", dirname,
|
|
|
+ log(LOG_WARN, "Could not chmod directory %s: %s", dirname,
|
|
|
strerror(errno));
|
|
|
return -1;
|
|
|
} else {
|
|
@@ -380,28 +380,28 @@ write_str_to_file(const char *fname, const char *str)
|
|
|
int fd;
|
|
|
FILE *file;
|
|
|
if (strlen(fname) > 1000) {
|
|
|
- log(LOG_WARNING, "Filename %s is too long.", fname);
|
|
|
+ log(LOG_WARN, "Filename %s is too long.", fname);
|
|
|
return -1;
|
|
|
}
|
|
|
strcpy(tempname,fname);
|
|
|
strcat(tempname,".tmp");
|
|
|
if ((fd = open(tempname, O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0) {
|
|
|
- log(LOG_WARNING, "Couldn't open %s for writing: %s", tempname,
|
|
|
+ log(LOG_WARN, "Couldn't open %s for writing: %s", tempname,
|
|
|
strerror(errno));
|
|
|
return -1;
|
|
|
}
|
|
|
if (!(file = fdopen(fd, "w"))) {
|
|
|
- log(LOG_WARNING, "Couldn't fdopen %s for writing: %s", tempname,
|
|
|
+ log(LOG_WARN, "Couldn't fdopen %s for writing: %s", tempname,
|
|
|
strerror(errno));
|
|
|
close(fd); return -1;
|
|
|
}
|
|
|
if (fputs(str,file) == EOF) {
|
|
|
- log(LOG_WARNING, "Error writing to %s: %s", tempname, strerror(errno));
|
|
|
+ log(LOG_WARN, "Error writing to %s: %s", tempname, strerror(errno));
|
|
|
fclose(file); return -1;
|
|
|
}
|
|
|
fclose(file);
|
|
|
if (rename(tempname, fname)) {
|
|
|
- log(LOG_WARNING, "Error replacing %s: %s", fname, strerror(errno));
|
|
|
+ log(LOG_WARN, "Error replacing %s: %s", fname, strerror(errno));
|
|
|
return -1;
|
|
|
}
|
|
|
return 0;
|
|
@@ -415,7 +415,7 @@ char *read_file_to_str(const char *filename) {
|
|
|
assert(filename);
|
|
|
|
|
|
if(strcspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != 0) {
|
|
|
- log_fn(LOG_WARNING,"Filename %s contains illegal characters.",filename);
|
|
|
+ log_fn(LOG_WARN,"Filename %s contains illegal characters.",filename);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
@@ -426,14 +426,14 @@ char *read_file_to_str(const char *filename) {
|
|
|
|
|
|
fd = open(filename,O_RDONLY,0);
|
|
|
if (fd<0) {
|
|
|
- log_fn(LOG_WARNING,"Could not open %s.",filename);
|
|
|
+ log_fn(LOG_WARN,"Could not open %s.",filename);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
string = tor_malloc(statbuf.st_size+1);
|
|
|
|
|
|
if(read_all(fd,string,statbuf.st_size) != statbuf.st_size) {
|
|
|
- log_fn(LOG_WARNING,"Couldn't read all %ld bytes of file '%s'.",
|
|
|
+ log_fn(LOG_WARN,"Couldn't read all %ld bytes of file '%s'.",
|
|
|
(long)statbuf.st_size,filename);
|
|
|
free(string);
|
|
|
close(fd);
|
|
@@ -485,7 +485,7 @@ try_next_line:
|
|
|
value++;
|
|
|
|
|
|
if(!*end || !*value) { /* only a key on this line. no value. */
|
|
|
- log_fn(LOG_WARNING,"Line has keyword '%s' but no value. Skipping.",s);
|
|
|
+ log_fn(LOG_WARN,"Line has keyword '%s' but no value. Skipping.",s);
|
|
|
goto try_next_line;
|
|
|
}
|
|
|
*end = 0; /* null it out */
|