From 22738f24b883e2576be934a0daf520250b5198ae Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 6 Jan 2010 18:59:30 +0000 Subject: encapsulate windowizms --- src/buffer.c | 6 +++++- src/init.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index de26ca7..e6f4804 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -605,7 +605,11 @@ int logWrites(char *commandStr, unsigned int address, int data, strlcpy(fileName, path, sizeof(fileName)); fileNamePtr = fileName; idx = strlen(fileName); - while (idx-- > 0 && fileName[idx] != '\\' && fileName[idx] != '/') +#if defined(__WIN32__) + while (idx-- > 0 && fileName[idx] != '\\') +#else + while (idx-- > 0 && fileName[idx] != '/') +#endif fileNamePtr = &fileName[idx]; formatStr(fileNamePtr, 14, MAXLEN - idx); fprintf(logPtr, "%s ", fileNamePtr); diff --git a/src/init.c b/src/init.c index 402f357..3aa8508 100644 --- a/src/init.c +++ b/src/init.c @@ -421,10 +421,13 @@ void initSp12(char *howWeAreCalled) { fprintf(stderr, "Unable to open %s for writing.\n", rcPath); exit(1); } - if (strrchr(howWeAreCalled, '/') != NULL) - howWeAreCalled = (strrchr(howWeAreCalled, '/') + 1); +#if defined(__WIN32__) if (strrchr(howWeAreCalled, '\\') != NULL) howWeAreCalled = (strrchr(howWeAreCalled, '\\') + 1); +#else + if (strrchr(howWeAreCalled, '/') != NULL) + howWeAreCalled = (strrchr(howWeAreCalled, '/') + 1); +#endif if (strchr(howWeAreCalled, 'k') == NULL) { KandaMode = 0; /* default is sp12 cable/dongle */ } else { @@ -470,10 +473,13 @@ void initSp12(char *howWeAreCalled) { * or the cable/dongle as supplied with the * Atmel/Kanda STK200/300 starter kits. */ - if (strrchr(howWeAreCalled, '/') != NULL) - howWeAreCalled = (strrchr(howWeAreCalled, '/') + 1); +#if defined(__WIN32__) if (strrchr(howWeAreCalled, '\\') != NULL) howWeAreCalled = (strrchr(howWeAreCalled, '\\') + 1); +#else + if (strrchr(howWeAreCalled, '/') != NULL) + howWeAreCalled = (strrchr(howWeAreCalled, '/') + 1); +#endif if (KandaMode == 0 || (KandaMode == 3 && strchr(howWeAreCalled, 'k') == NULL)) { SCK = S_SCK; MOSI = S_MOSI; -- cgit v1.2.3