Changeset 4382 for trunk/oscam-log.c
- Timestamp:
- 01/09/11 03:59:19 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-log.c
r4364 r4382 32 32 if( stlog.st_size >= cfg->max_log_size*1024 && *f != NULL) { 33 33 int rc; 34 char prev_log[ 128];35 s printf(prev_log, "%s-prev", file);34 char prev_log[strlen(file) + 6]; 35 snprintf(prev_log, sizeof(prev_log), "%s-prev", file); 36 36 if ( pthread_mutex_trylock(&switching_log) == 0) { //I got the lock so I am the first thread detecting a switchlog is needed 37 37 fprintf(*f, "switch log file\n"); … … 154 154 switch(flag) { 155 155 case -1: 156 s printf(log_buf,"[LOG000]%4d/%02d/%02d %2d:%02d:%02d %s\n",156 snprintf(log_buf, sizeof(log_buf), "[LOG000]%4d/%02d/%02d %2d:%02d:%02d %s\n", 157 157 lt.tm_year+1900, lt.tm_mon+1, lt.tm_mday, 158 158 lt.tm_hour, lt.tm_min, lt.tm_sec, txt); 159 159 break; 160 160 case 1: 161 s printf(log_buf, "[LOG000]%4d/%02d/%02d %2d:%02d:%02d %s",161 snprintf(log_buf, sizeof(log_buf), "[LOG000]%4d/%02d/%02d %2d:%02d:%02d %s", 162 162 lt.tm_year+1900, lt.tm_mon+1, lt.tm_mday, 163 163 lt.tm_hour, lt.tm_min, lt.tm_sec, txt); 164 164 break; 165 165 default: 166 s printf(log_buf, "[LOG000]%s", txt);166 snprintf(log_buf, sizeof(log_buf), "[LOG000]%s", txt); 167 167 } 168 168 … … 200 200 continue; 201 201 } 202 s printf(sbuf, "%03d", cl->logcounter);202 snprintf(sbuf, sizeof(sbuf), "%03d", cl->logcounter); 203 203 cl->logcounter = (cl->logcounter+1) % 1000; 204 204 memcpy(log_buf + 4, sbuf, 3); … … 214 214 va_list params; 215 215 va_start(params, fmt); 216 vs printf(log_txt+11, fmt, params);216 vsnprintf(log_txt+11, sizeof(log_txt) - 11, fmt, params); 217 217 va_end(params); 218 218 write_to_log(-1, log_txt); … … 234 234 va_list params; 235 235 va_start(params, fmt); 236 vs printf(log_txt+11, fmt, params);236 vsnprintf(log_txt+11, sizeof(log_txt) - 11, fmt, params); 237 237 va_end(params); 238 238 write_to_log(-1, log_txt); … … 250 250 va_list params; 251 251 va_start(params, fmt); 252 vs printf(log_txt+11, fmt, params);252 vsnprintf(log_txt+11, sizeof(log_txt) - 11, fmt, params); 253 253 va_end(params); 254 254 write_to_log(-1, log_txt); … … 259 259 { 260 260 get_log_header(0, log_txt); 261 s printf(log_txt+11, "%s", cs_hexdump(1, buf+i, (n-i>16) ? 16 : n-i));261 snprintf(log_txt+11, sizeof(log_txt) - 11, "%s", cs_hexdump(1, buf+i, (n-i>16) ? 16 : n-i)); 262 262 write_to_log(-1, log_txt); 263 263 } … … 274 274 va_list params; 275 275 va_start(params, fmt); 276 vs printf(log_txt+11, fmt, params);276 vsnprintf(log_txt+11, sizeof(log_txt) - 11, fmt, params); 277 277 va_end(params); 278 278 write_to_log(-1, log_txt); … … 284 284 { 285 285 get_log_header(0, log_txt); 286 s printf(log_txt+11, "%s", cs_hexdump(1, buf+i, (n-i>16) ? 16 : n-i));286 snprintf(log_txt+11, sizeof(log_txt) - 11, "%s", cs_hexdump(1, buf+i, (n-i>16) ? 16 : n-i)); 287 287 write_to_log(-1, log_txt); 288 288 } … … 348 348 * so we can use the same Pipe as Log 349 349 */ 350 s printf(buf, "s%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %02d:%02d:%02d %s %04X:%04X %s\n",350 snprintf(buf, sizeof(buf), "s%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %02d:%02d:%02d %s %04X:%04X %s\n", 351 351 lt.tm_mday, lt.tm_mon+1, lt.tm_year%100, 352 352 lt.tm_hour, lt.tm_min, lt.tm_sec, cwps,
Note:
See TracChangeset
for help on using the changeset viewer.