Fossil

Check-in [12453740]
Login

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

Overview
Comment:Fix compilation issues cause by the trunk merge.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mvHardDirFix
Files: files | file ages | folders
SHA1:12453740c7089157342a232ef17ebb8652b921b3
User & Date: mistachkin 2016-03-11 23:38:47
Context
2016-03-12
00:47
Update the expected results of the tests to account for trunk changes. Closed-Leaf check-in: b5113985 user: mistachkin tags: mvHardDirFix
2016-03-11
23:38
Fix compilation issues cause by the trunk merge. check-in: 12453740 user: mistachkin tags: mvHardDirFix
2016-03-06
06:26
Merge updates from trunk. check-in: abd131b8 user: mistachkin tags: mvHardDirFix
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/add.c.

783
784
785
786
787
788
789
790

791

792
793
794
795
796
797
798
799
  Stmt move;
  if( db_table_exists(db_name("temp"), "fmove") ){
    db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;");
    while( db_step(&move)==SQLITE_ROW ){
      const char *zOldName = db_column_text(&move, 0);
      const char *zNewName = db_column_text(&move, 1);
      if( !dryRunFlag ){
        if( file_isdir(zOldName)==1 ){

          if( file_isdir(zNewName)==0 ){

            file_rename(zOldName, zNewName);
          }
        }else{
          if( file_wd_islink(zOldName) ){
            symlink_copy(zOldName, zNewName);
          }else{
            file_copy(zOldName, zNewName);
          }







|
>
|
>
|







783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
  Stmt move;
  if( db_table_exists(db_name("temp"), "fmove") ){
    db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;");
    while( db_step(&move)==SQLITE_ROW ){
      const char *zOldName = db_column_text(&move, 0);
      const char *zNewName = db_column_text(&move, 1);
      if( !dryRunFlag ){
        int isOldDir = file_isdir(zOldName);
        if( isOldDir==1 ){
          int isNewDir = file_isdir(zNewName);
          if( isNewDir==0 ){
            file_rename(zOldName, zNewName, isOldDir, isNewDir);
          }
        }else{
          if( file_wd_islink(zOldName) ){
            symlink_copy(zOldName, zNewName);
          }else{
            file_copy(zOldName, zNewName);
          }

Changes to src/file.c.

402
403
404
405
406
407
408

409




410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
  }
}

/*
** Rename a file or directory.
** Returns zero upon success.
*/

int file_rename(const char *zFrom, const char *zTo){




  int rc;
#if defined(_WIN32)
  wchar_t *zMbcsFrom = fossil_utf8_to_filename(zFrom);
  wchar_t *zMbcsTo = fossil_utf8_to_filename(zTo);
  rc = _wrename(zMbcsFrom, zMbcsTo);
#else
  char *zMbcsFrom = fossil_utf8_to_filename(zFrom);
  char *zMbcsTo = fossil_utf8_to_filename(zTo);
  rc = rename(zMbcsFrom, zMbcsTo);
#endif
  fossil_filename_free(zMbcsTo);
  fossil_filename_free(zMbcsFrom);
  return rc;
}

/*
** Copy the content of a file from one place to another.
*/
void file_copy(const char *zFrom, const char *zTo){







>
|
>
>
>
>


|
|


|
|


|
|







402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
  }
}

/*
** Rename a file or directory.
** Returns zero upon success.
*/
int file_rename(
  const char *zFrom,
  const char *zTo,
  int isFromDir,
  int isToDir
){
  int rc;
#if defined(_WIN32)
  wchar_t *zMbcsFrom = fossil_utf8_to_path(zFrom, isFromDir);
  wchar_t *zMbcsTo = fossil_utf8_to_path(zTo, isToDir);
  rc = _wrename(zMbcsFrom, zMbcsTo);
#else
  char *zMbcsFrom = fossil_utf8_to_path(zFrom, isFromDir);
  char *zMbcsTo = fossil_utf8_to_path(zTo, isToDir);
  rc = rename(zMbcsFrom, zMbcsTo);
#endif
  fossil_path_free(zMbcsTo);
  fossil_path_free(zMbcsFrom);
  return rc;
}

/*
** Copy the content of a file from one place to another.
*/
void file_copy(const char *zFrom, const char *zTo){