Overview
Comment: | Added support for logging to a file using CACKEY_DEBUG_LOGFILE environment variable |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b9df324b668adec2ed8011b0bb829830 |
User & Date: | rkeene on 2012-07-19 18:03:46 |
Other Links: | manifest | tags |
Context
2012-07-20
| ||
00:53 | Corrected type-punning issue check-in: 9bed3538e1 user: rkeene tags: trunk | |
2012-07-19
| ||
18:03 | Added support for logging to a file using CACKEY_DEBUG_LOGFILE environment variable check-in: b9df324b66 user: rkeene tags: trunk | |
18:03 | Corrected type for debugging certificates check-in: ecfb2af250 user: rkeene tags: trunk | |
Changes
Modified cackey.c from [f9930320b1] to [556e3f5257].
︙ | ︙ | |||
170 171 172 173 174 175 176 | #define MAX_ATR_SIZE 1024 #endif #ifdef CACKEY_DEBUG # ifdef HAVE_TIME_H # include <time.h> static time_t cackey_debug_start_time = 0; | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | #define MAX_ATR_SIZE 1024 #endif #ifdef CACKEY_DEBUG # ifdef HAVE_TIME_H # include <time.h> static time_t cackey_debug_start_time = 0; # define CACKEY_DEBUG_PRINTTIME { if (cackey_debug_start_time == 0) { cackey_debug_start_time = time(NULL); }; fprintf(cackey_debug_fd(), "[%lu]: ", (unsigned long) (time(NULL) - cackey_debug_start_time)); } # else # define CACKEY_DEBUG_PRINTTIME /**/ # endif # define CACKEY_DEBUG_PRINTF(x...) { CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: ", __func__, __LINE__); fprintf(cackey_debug_fd(), x); fprintf(cackey_debug_fd(), "\n"); fflush(cackey_debug_fd()); } # define CACKEY_DEBUG_PRINTBUF(f, x, y) { unsigned char *TMPBUF; unsigned long idx; TMPBUF = (unsigned char *) (x); CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: %s (%s/%lu = {%02x", __func__, __LINE__, f, #x, (unsigned long) (y), TMPBUF[0]); for (idx = 1; idx < (y); idx++) { fprintf(cackey_debug_fd(), ", %02x", TMPBUF[idx]); }; fprintf(cackey_debug_fd(), "})\n"); fflush(cackey_debug_fd()); } # define CACKEY_DEBUG_PERROR(x) { fprintf(cackey_debug_fd(), "%s():%i: ", __func__, __LINE__); CACKEY_DEBUG_PRINTTIME; perror(x); fflush(cackey_debug_fd()); } # define free(x) { CACKEY_DEBUG_PRINTF("FREE(%p) (%s)", x, #x); free(x); } static FILE *cackey_debug_fd(void) { static FILE *fd = NULL; char *logfile; if (fd != NULL) { return(fd); } /* * Log to stderr initially so we can use debugging within * this function without getting into an infinite loop */ fd = stderr; logfile = getenv("CACKEY_DEBUG_LOGFILE"); if (logfile != NULL) { CACKEY_DEBUG_PRINTF("Found environment variable: %s", logfile); logfile = strchr(logfile, '='); if (logfile == NULL) { logfile = getenv("CACKEY_DEBUG_LOGFILE"); } else { logfile++; } } if (logfile != NULL) { CACKEY_DEBUG_PRINTF("Found log file: %s", logfile); fd = fopen(logfile, "a"); } if (fd == NULL) { fd = stderr; } if (fd == stderr) { CACKEY_DEBUG_PRINTF("Returning stderr"); } else { CACKEY_DEBUG_PRINTF("Returning %p", fd); } return(fd); } static void *CACKEY_DEBUG_FUNC_MALLOC(size_t size, const char *func, int line) { void *retval; retval = malloc(size); CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: ", func, line); fprintf(cackey_debug_fd(), "MALLOC() = %p", retval); fprintf(cackey_debug_fd(), "\n"); fflush(cackey_debug_fd()); return(retval); } static void *CACKEY_DEBUG_FUNC_REALLOC(void *ptr, size_t size, const char *func, int line) { void *retval; retval = realloc(ptr, size); if (retval != ptr) { CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: ", func, line); fprintf(cackey_debug_fd(), "REALLOC(%p) = %p", ptr, retval); fprintf(cackey_debug_fd(), "\n"); fflush(cackey_debug_fd()); } if (retval == NULL) { CACKEY_DEBUG_PRINTF(" *** ERROR *** realloc returned NULL (size = %lu)", (unsigned long) size); } return(retval); } static char *CACKEY_DEBUG_FUNC_STRDUP(const char *ptr, const char *func, int line) { char *retval; retval = strdup(ptr); CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: ", func, line); fprintf(cackey_debug_fd(), "STRDUP_MALLOC() = %p", retval); fprintf(cackey_debug_fd(), "\n"); fflush(cackey_debug_fd()); return(retval); } static const char *CACKEY_DEBUG_FUNC_TAG_TO_STR(unsigned char tag) { switch (tag) { case GSCIS_TAG_CARDID: |
︙ | ︙ |