author | zautrix <zautrix> | 2004-10-05 11:13:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-05 11:13:51 (UTC) |
commit | 50ab40e1e02ad7c65c17a78d08116a808b1257aa (patch) (unidiff) | |
tree | 0d1939e2297fa7bbd8e1f2030f154463854164c6 /gammu/emb/common/misc/misc.c | |
parent | cf8616f64f20e5448d4ff644f7cc15750cf3f85f (diff) | |
download | kdepimpi-50ab40e1e02ad7c65c17a78d08116a808b1257aa.zip kdepimpi-50ab40e1e02ad7c65c17a78d08116a808b1257aa.tar.gz kdepimpi-50ab40e1e02ad7c65c17a78d08116a808b1257aa.tar.bz2 |
updated to latest gammu version
-rw-r--r-- | gammu/emb/common/misc/misc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gammu/emb/common/misc/misc.c b/gammu/emb/common/misc/misc.c index c2f09e4..7227e7b 100644 --- a/gammu/emb/common/misc/misc.c +++ b/gammu/emb/common/misc/misc.c | |||
@@ -1,37 +1,40 @@ | |||
1 | /* (c) 2002-2004 by Marcin Wiacek and Michal Cihar */ | 1 | /* (c) 2002-2004 by Marcin Wiacek and Michal Cihar */ |
2 | /* Checking used compiler (c) 2002 by Michal Cihar */ | 2 | /* Checking used compiler (c) 2002 by Michal Cihar */ |
3 | 3 | ||
4 | #include <string.h> | 4 | #include <string.h> |
5 | #include <ctype.h> | 5 | #include <ctype.h> |
6 | #include <time.h> | 6 | #include <time.h> |
7 | #include <stdarg.h> | 7 | #include <stdarg.h> |
8 | #include <stdio.h> | 8 | #include <stdio.h> |
9 | #include <locale.h> | 9 | #include <locale.h> |
10 | #include <sys/timeb.h> | 10 | #include <sys/timeb.h> |
11 | #ifdef WIN32 | 11 | #ifdef WIN32 |
12 | # include "windows.h" | 12 | # include "windows.h" |
13 | #endif | 13 | #endif |
14 | #if defined(linux) || defined(__linux) || defined(__linux__) | ||
15 | # include <sys/utsname.h> | ||
16 | #endif | ||
14 | 17 | ||
15 | #include "../gsmstate.h" | 18 | #include "../gsmstate.h" |
16 | #include "misc.h" | 19 | #include "misc.h" |
17 | 20 | ||
18 | /* Based on article in Polish PC-Kurier 8/1998 page 104 | 21 | /* Based on article in Polish PC-Kurier 8/1998 page 104 |
19 | * Archive on http://www.pckurier.pl | 22 | * Archive on http://www.pckurier.pl |
20 | */ | 23 | */ |
21 | char *DayOfWeek (int year, int month, int day) | 24 | char *DayOfWeek (int year, int month, int day) |
22 | { | 25 | { |
23 | int p,q,r,w; | 26 | int p,q,r,w; |
24 | static char DayOfWeekChar[10]; | 27 | static char DayOfWeekChar[10]; |
25 | 28 | ||
26 | p=(14-month) / 12; | 29 | p=(14-month) / 12; |
27 | q=month+12*p-2; | 30 | q=month+12*p-2; |
28 | r=year-p; | 31 | r=year-p; |
29 | w=(day+(31*q) / 12 + r + r / 4 - r / 100 + r / 400) % 7; | 32 | w=(day+(31*q) / 12 + r + r / 4 - r / 100 + r / 400) % 7; |
30 | strcpy(DayOfWeekChar,""); | 33 | strcpy(DayOfWeekChar,""); |
31 | switch (w) { | 34 | switch (w) { |
32 | case 0: strcpy(DayOfWeekChar,"Sun"); break; | 35 | case 0: strcpy(DayOfWeekChar,"Sun"); break; |
33 | case 1: strcpy(DayOfWeekChar,"Mon"); break; | 36 | case 1: strcpy(DayOfWeekChar,"Mon"); break; |
34 | case 2: strcpy(DayOfWeekChar,"Tue"); break; | 37 | case 2: strcpy(DayOfWeekChar,"Tue"); break; |
35 | case 3: strcpy(DayOfWeekChar,"Wed"); break; | 38 | case 3: strcpy(DayOfWeekChar,"Wed"); break; |
36 | case 4: strcpy(DayOfWeekChar,"Thu"); break; | 39 | case 4: strcpy(DayOfWeekChar,"Thu"); break; |
37 | case 5: strcpy(DayOfWeekChar,"Fri"); break; | 40 | case 5: strcpy(DayOfWeekChar,"Fri"); break; |
@@ -210,52 +213,54 @@ char *OSDate (GSM_DateTime dt) | |||
210 | #else | 213 | #else |
211 | strftime(retval2, 200, "%x", &timeptr); | 214 | strftime(retval2, 200, "%x", &timeptr); |
212 | #endif | 215 | #endif |
213 | /* If don't have weekday name, include it */ | 216 | /* If don't have weekday name, include it */ |
214 | strftime(retval, 200, "%A", &timeptr); | 217 | strftime(retval, 200, "%A", &timeptr); |
215 | if (strstr(retval2,retval)==NULL) { | 218 | if (strstr(retval2,retval)==NULL) { |
216 | /* Check also for short name */ | 219 | /* Check also for short name */ |
217 | strftime(retval, 200, "%a", &timeptr); | 220 | strftime(retval, 200, "%a", &timeptr); |
218 | if (strstr(retval2,retval)==NULL) { | 221 | if (strstr(retval2,retval)==NULL) { |
219 | strcat(retval2," ("); | 222 | strcat(retval2," ("); |
220 | strcat(retval2,retval); | 223 | strcat(retval2,retval); |
221 | strcat(retval2,")"); | 224 | strcat(retval2,")"); |
222 | } | 225 | } |
223 | } | 226 | } |
224 | 227 | ||
225 | #ifdef WIN32 | 228 | #ifdef WIN32 |
226 | setlocale(LC_ALL, ".ACP"); | 229 | setlocale(LC_ALL, ".ACP"); |
227 | #endif | 230 | #endif |
228 | 231 | ||
229 | return retval2; | 232 | return retval2; |
230 | } | 233 | } |
231 | 234 | ||
232 | bool CheckDate(GSM_DateTime *date) | 235 | bool CheckDate(GSM_DateTime *date) |
233 | { | 236 | { |
234 | /* FIXME: This could also check if day is correct for selected month */ | 237 | const unsigned int days[]={31,29,31,30,31,30,31,31,30,31,30,31}; |
238 | |||
239 | /* FIXME: This could also check for leap years */ | ||
235 | return date->Year != 0 && | 240 | return date->Year != 0 && |
236 | date->Month >= 1 && date->Month <= 12 && | 241 | date->Month >= 1 && date->Month <= 12 && |
237 | date->Day >= 1 && date->Day <= 31; | 242 | date->Day >= 1 && date->Day <= days[date->Month]; |
238 | } | 243 | } |
239 | 244 | ||
240 | bool CheckTime(GSM_DateTime *date) | 245 | bool CheckTime(GSM_DateTime *date) |
241 | { | 246 | { |
242 | return date->Hour <= 23 && date->Hour >= 0 && | 247 | return date->Hour <= 23 && date->Hour >= 0 && |
243 | date->Minute <= 59 && date->Minute >= 0 && | 248 | date->Minute <= 59 && date->Minute >= 0 && |
244 | date->Second <= 59 && date->Second >= 0; | 249 | date->Second <= 59 && date->Second >= 0; |
245 | } | 250 | } |
246 | 251 | ||
247 | int GetLine(FILE *File, char *Line, int count) | 252 | int GetLine(FILE *File, char *Line, int count) |
248 | { | 253 | { |
249 | int num; | 254 | int num; |
250 | 255 | ||
251 | if (fgets(Line, count, File) != NULL) { | 256 | if (fgets(Line, count, File) != NULL) { |
252 | num = strlen(Line) - 1; | 257 | num = strlen(Line) - 1; |
253 | while(1) { | 258 | while(1) { |
254 | if (Line[num] != '\n' && Line[num] != '\r') break; | 259 | if (Line[num] != '\n' && Line[num] != '\r') break; |
255 | if (num == 0) break; | 260 | if (num == 0) break; |
256 | Line[num--] = 0; | 261 | Line[num--] = 0; |
257 | } | 262 | } |
258 | return strlen(Line); | 263 | return strlen(Line); |
259 | } | 264 | } |
260 | return -1; | 265 | return -1; |
261 | } | 266 | } |
@@ -430,48 +435,51 @@ void DumpMessage(FILE *df, Debug_Level dl, const unsigned char *message, int mes | |||
430 | if (j != len-1) buffer[j*4+2] = message[i]; | 435 | if (j != len-1) buffer[j*4+2] = message[i]; |
431 | buffer[(len-1)*4+j+3] = message[i]; | 436 | buffer[(len-1)*4+j+3] = message[i]; |
432 | } else { | 437 | } else { |
433 | buffer[(len-1)*4+j+3] = '.'; | 438 | buffer[(len-1)*4+j+3] = '.'; |
434 | } | 439 | } |
435 | if (j != len-1 && i != messagesize-1) buffer[j*4+3] = '|'; | 440 | if (j != len-1 && i != messagesize-1) buffer[j*4+3] = '|'; |
436 | if (j == len-1) { | 441 | if (j == len-1) { |
437 | smfprintf(df, dl, "%s\n", buffer); | 442 | smfprintf(df, dl, "%s\n", buffer); |
438 | memset(buffer,0x20,sizeof(buffer)); | 443 | memset(buffer,0x20,sizeof(buffer)); |
439 | buffer[len*5-1]=0; | 444 | buffer[len*5-1]=0; |
440 | j = 0; | 445 | j = 0; |
441 | } else { | 446 | } else { |
442 | j++; | 447 | j++; |
443 | } | 448 | } |
444 | } | 449 | } |
445 | if (j != 0) smfprintf(df, dl, "%s\n", buffer); | 450 | if (j != 0) smfprintf(df, dl, "%s\n", buffer); |
446 | } | 451 | } |
447 | 452 | ||
448 | char *GetOS(void) | 453 | char *GetOS(void) |
449 | { | 454 | { |
450 | #ifdef WIN32 | 455 | #ifdef WIN32 |
451 | OSVERSIONINFOEX Ver; | 456 | OSVERSIONINFOEX Ver; |
452 | bool Extended = true; | 457 | bool Extended = true; |
453 | #endif | 458 | #endif |
459 | #if defined(linux) || defined(__linux) || defined(__linux__) | ||
460 | struct utsnameVer; | ||
461 | #endif | ||
454 | static char Buffer[100] = {0x00}; | 462 | static char Buffer[100] = {0x00}; |
455 | 463 | ||
456 | #ifdef WIN32 | 464 | #ifdef WIN32 |
457 | memset(&Ver,sizeof(OSVERSIONINFOEX),0); | 465 | memset(&Ver,sizeof(OSVERSIONINFOEX),0); |
458 | Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); | 466 | Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); |
459 | 467 | ||
460 | if (!GetVersionEx((OSVERSIONINFO *)&Ver)) { | 468 | if (!GetVersionEx((OSVERSIONINFO *)&Ver)) { |
461 | Extended = false; | 469 | Extended = false; |
462 | Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); | 470 | Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); |
463 | if (!GetVersionEx((OSVERSIONINFO *)&Ver)) { | 471 | if (!GetVersionEx((OSVERSIONINFO *)&Ver)) { |
464 | //#ifdef _MSC_VER | 472 | //#ifdef _MSC_VER |
465 | // Ver.dwMajorVersion = _winmajor; | 473 | // Ver.dwMajorVersion = _winmajor; |
466 | // Ver.dwMinorVersion = _winminor; | 474 | // Ver.dwMinorVersion = _winminor; |
467 | // Ver.dwBuildNumber = _osver; | 475 | // Ver.dwBuildNumber = _osver; |
468 | //#else | 476 | //#else |
469 | sprintf(Buffer, "Windows"); | 477 | sprintf(Buffer, "Windows"); |
470 | return Buffer; | 478 | return Buffer; |
471 | //#endif | 479 | //#endif |
472 | } | 480 | } |
473 | } | 481 | } |
474 | 482 | ||
475 | /* ----------------- 9x family ------------------ */ | 483 | /* ----------------- 9x family ------------------ */ |
476 | 484 | ||
477 | /* no info about Win95 SP1, Win95 OSR2.1, Win95 OSR2.5.... */ | 485 | /* no info about Win95 SP1, Win95 OSR2.1, Win95 OSR2.5.... */ |
@@ -499,49 +507,50 @@ char *GetOS(void) | |||
499 | 507 | ||
500 | } else if (Ver.dwMajorVersion == 5 && Ver.dwMinorVersion == 1 && Ver.dwBuildNumber == 2600) { | 508 | } else if (Ver.dwMajorVersion == 5 && Ver.dwMinorVersion == 1 && Ver.dwBuildNumber == 2600) { |
501 | sprintf(Buffer,"Win XP"); | 509 | sprintf(Buffer,"Win XP"); |
502 | #if _MSC_VER > 1200 //6.0 has it undeclared | 510 | #if _MSC_VER > 1200 //6.0 has it undeclared |
503 | if (Extended) { | 511 | if (Extended) { |
504 | if (Ver.wSuiteMask & VER_SUITE_PERSONAL) { | 512 | if (Ver.wSuiteMask & VER_SUITE_PERSONAL) { |
505 | sprintf(Buffer+strlen(Buffer)," Home"); | 513 | sprintf(Buffer+strlen(Buffer)," Home"); |
506 | } else { | 514 | } else { |
507 | sprintf(Buffer+strlen(Buffer)," Pro"); | 515 | sprintf(Buffer+strlen(Buffer)," Pro"); |
508 | } | 516 | } |
509 | } | 517 | } |
510 | #endif | 518 | #endif |
511 | 519 | ||
512 | } else if (Ver.dwMajorVersion == 5 && Ver.dwMinorVersion == 2) { | 520 | } else if (Ver.dwMajorVersion == 5 && Ver.dwMinorVersion == 2) { |
513 | sprintf(Buffer,"Win 2003"); | 521 | sprintf(Buffer,"Win 2003"); |
514 | 522 | ||
515 | } else { | 523 | } else { |
516 | sprintf(Buffer, "Windows %i.%i.%i",Ver.dwMajorVersion,Ver.dwMinorVersion,Ver.dwBuildNumber); | 524 | sprintf(Buffer, "Windows %i.%i.%i",Ver.dwMajorVersion,Ver.dwMinorVersion,Ver.dwBuildNumber); |
517 | } | 525 | } |
518 | 526 | ||
519 | if (Extended && Ver.wServicePackMajor != 0) { | 527 | if (Extended && Ver.wServicePackMajor != 0) { |
520 | sprintf(Buffer+strlen(Buffer)," SP%i",Ver.wServicePackMajor); | 528 | sprintf(Buffer+strlen(Buffer)," SP%i",Ver.wServicePackMajor); |
521 | } | 529 | } |
522 | #elif defined(linux) || defined(__linux) || defined(__linux__) | 530 | #elif defined(linux) || defined(__linux) || defined(__linux__) |
523 | sprintf(Buffer, "Linux"); | 531 | uname(&Ver); |
532 | sprintf(Buffer, "Linux, kernel %s",Ver.release); | ||
524 | #elif defined(__FreeBSD__) | 533 | #elif defined(__FreeBSD__) |
525 | sprintf(Buffer, "FreeBSD"); | 534 | sprintf(Buffer, "FreeBSD"); |
526 | #elif defined(__NetBSD__) | 535 | #elif defined(__NetBSD__) |
527 | sprintf(Buffer, "NetBSD"); | 536 | sprintf(Buffer, "NetBSD"); |
528 | #elif defined(__OpenBSD__) | 537 | #elif defined(__OpenBSD__) |
529 | sprintf(Buffer, "OpenBSD"); | 538 | sprintf(Buffer, "OpenBSD"); |
530 | #elif defined(__GNU__) | 539 | #elif defined(__GNU__) |
531 | sprintf(Buffer, "GNU/Hurd"); | 540 | sprintf(Buffer, "GNU/Hurd"); |
532 | #elif defined(sun) || defined(__sun) || defined(__sun__) | 541 | #elif defined(sun) || defined(__sun) || defined(__sun__) |
533 | # ifdef __SVR4 | 542 | # ifdef __SVR4 |
534 | sprintf(Buffer, "Sun Solaris"); | 543 | sprintf(Buffer, "Sun Solaris"); |
535 | # else | 544 | # else |
536 | sprintf(Buffer, "SunOS"); | 545 | sprintf(Buffer, "SunOS"); |
537 | # endif | 546 | # endif |
538 | #elif defined(hpux) || defined(__hpux) || defined(__hpux__) | 547 | #elif defined(hpux) || defined(__hpux) || defined(__hpux__) |
539 | sprintf(Buffer, "HP-UX"); | 548 | sprintf(Buffer, "HP-UX"); |
540 | #elif defined(ultrix) || defined(__ultrix) || defined(__ultrix__) | 549 | #elif defined(ultrix) || defined(__ultrix) || defined(__ultrix__) |
541 | sprintf(Buffer, "DEC Ultrix"); | 550 | sprintf(Buffer, "DEC Ultrix"); |
542 | #elif defined(sgi) || defined(__sgi) | 551 | #elif defined(sgi) || defined(__sgi) |
543 | sprintf(Buffer, "SGI Irix"); | 552 | sprintf(Buffer, "SGI Irix"); |
544 | #elif defined(__osf__) | 553 | #elif defined(__osf__) |
545 | sprintf(Buffer, "OSF Unix"); | 554 | sprintf(Buffer, "OSF Unix"); |
546 | #elif defined(bsdi) || defined(__bsdi__) | 555 | #elif defined(bsdi) || defined(__bsdi__) |
547 | sprintf(Buffer, "BSDI Unix"); | 556 | sprintf(Buffer, "BSDI Unix"); |