Fossil

Check-in [ed5695fe7f]
Login

Check-in [ed5695fe7f]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix [ce73fc2173] as well
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | restore-win95
Files: files | file ages | folders
SHA1: ed5695fe7fe2afcd4d87f1e5137b47bae7c5b646
User & Date: jan.nijtmans 2012-09-12 14:42:19.447
Context
2012-09-12
20:36
unbreak MSVC build. <p>Always use platform detection in fossil_system: fossil might be linked with unicows, then still quotes should not be used on Win95 <p>Why did I remove the -DUNICODE from Makefile.msc?.... ... (check-in: ebe241b4df user: jan.nijtmans tags: restore-win95)
14:42
fix [ce73fc2173] as well ... (check-in: ed5695fe7f user: jan.nijtmans tags: restore-win95)
11:32
better fix ... (check-in: 3c33959096 user: jan.nijtmans tags: restore-win95)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
︙︙
825
826
827
828
829
830
831
832
833
834

835












836
837
838
839
840
841
842


/*
** This function implements a cross-platform "system()" interface.
*/
int fossil_system(const char *zOrigCmd){
  int rc;
#if defined(_WIN32)
  /* On windows, we have to put double-quotes around the entire command.
  ** Who knows why - this is just the way windows works.
  */

  char *zNewCmd = mprintf("\"%s\"", zOrigCmd);












  TCHAR *zMbcs = fossil_utf8_to_mbcs(zNewCmd);
  if( g.fSystemTrace ) {
    char *zOut = mprintf("SYSTEM: %s\n", zNewCmd);
    fossil_puts(zOut, 1);
    fossil_free(zOut);
  }
  rc = _tsystem(zMbcs);








|


>

>
>
>
>
>
>
>
>
>
>
>
>








825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855


/*
** This function implements a cross-platform "system()" interface.
*/
int fossil_system(const char *zOrigCmd){
  int rc;
#if defined(_WIN32)
  /* On windows NT, we have to put double-quotes around the entire command.
  ** Who knows why - this is just the way windows works.
  */
#ifdef UNICODE
  char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
#else
  OSVERSIONINFOA sInfo;
  char *zNewCmd;

  sInfo.dwOSVersionInfoSize = sizeof(sInfo);
  GetVersionExA(&sInfo);
  if (sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT) {
    zNewCmd = mprintf("\"%s\"", zOrigCmd);
  } else {
    zNewCmd = mprintf("%s", zOrigCmd);
  }
#endif
  TCHAR *zMbcs = fossil_utf8_to_mbcs(zNewCmd);
  if( g.fSystemTrace ) {
    char *zOut = mprintf("SYSTEM: %s\n", zNewCmd);
    fossil_puts(zOut, 1);
    fossil_free(zOut);
  }
  rc = _tsystem(zMbcs);
︙︙