com0com-cvs

[Vyacheslav F. <vf...@us...>]

Update of /cvsroot/com0com/com0com/setup
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15495

Modified Files:
	setup.cpp params.cpp 
Log Message:
Replaced strtok() by STRTOK_R()



Index: params.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/params.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** params.cpp	2 Nov 2006 16:11:58 -0000	1.3
--- params.cpp	11 Jan 2007 15:05:03 -0000	1.4
***************
*** 2,6 ****
   * $Id$
   *
!  * Copyright (c) 2006 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * $Id$
   *
!  * Copyright (c) 2006-2007 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.4  2007/01/11 15:05:03  vfrolov
+  * Replaced strtok() by STRTOK_R()
+  *
   * Revision 1.3  2006/11/02 16:11:58  vfrolov
   * Added default values to help text
***************
*** 34,37 ****
--- 37,41 ----
  #include "params.h"
  #include "utils.h"
+ #include "msg.h"
  
  ///////////////////////////////////////////////////////////////
***************
*** 378,400 ****
      pars[sizeof(pars) - 1] = 0;
  
!     for (const char *pPar = strtok(pars, "=") ; pPar ; pPar = strtok(NULL, "=")) {
!       const char *pVal = strtok(NULL, ",");
  
!       //Trace("'%s'='%s'\n", pPar, pVal);
  
        if (!pVal)
          return FALSE;
  
!       if (!lstrcmpi(pPar, "PortName")) {
          if (!tmp.SetPortName(pVal))
            return FALSE;
        }
        else
!       if (!lstrcmpi(pPar, "EmuBR")) {
          if (!tmp.SetEmuBR(pVal))
            return FALSE;
        }
        else
!       if (!lstrcmpi(pPar, "EmuOverrun")) {
          if (!tmp.SetEmuOverrun(pVal))
            return FALSE;
--- 382,408 ----
      pars[sizeof(pars) - 1] = 0;
  
!     char *pSave1;
  
!     for (char *pPar = STRTOK_R(pars, ",", &pSave1) ; pPar ; pPar = STRTOK_R(NULL, ",", &pSave1)) {
!       char *pSave2;
!       const char *pKey = STRTOK_R(pPar, "=", &pSave2);
!       const char *pVal = STRTOK_R(NULL, "=", &pSave2);
! 
!       //Trace("'%s'='%s'\n", pKey, pVal);
  
        if (!pVal)
          return FALSE;
  
!       if (!lstrcmpi(pKey, "PortName")) {
          if (!tmp.SetPortName(pVal))
            return FALSE;
        }
        else
!       if (!lstrcmpi(pKey, "EmuBR")) {
          if (!tmp.SetEmuBR(pVal))
            return FALSE;
        }
        else
!       if (!lstrcmpi(pKey, "EmuOverrun")) {
          if (!tmp.SetEmuOverrun(pVal))
            return FALSE;

Index: setup.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** setup.cpp	21 Nov 2006 11:36:06 -0000	1.11
--- setup.cpp	11 Jan 2007 15:05:03 -0000	1.12
***************
*** 2,6 ****
   * $Id$
   *
!  * Copyright (c) 2006 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * $Id$
   *
!  * Copyright (c) 2006-2007 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.12  2007/01/11 15:05:03  vfrolov
+  * Replaced strtok() by STRTOK_R()
+  *
   * Revision 1.11  2006/11/21 11:36:06  vfrolov
   * Added --output option
***************
*** 859,863 ****
    argc = 0;
  
!   for (char *pArg = strtok(pCmd, " \t\r\n") ; pArg ; pArg = strtok(NULL, " \t\r\n")) {
      if ((argc + 2) > sizeArgv)
        break;
--- 862,868 ----
    argc = 0;
  
!   char *pSave;
! 
!   for (char *pArg = STRTOK_R(pCmd, " \t\r\n", &pSave) ; pArg ; pArg = STRTOK_R(NULL, " \t\r\n", &pSave)) {
      if ((argc + 2) > sizeArgv)
        break;