Changeset 684 in svn for trunk/processor/processor.m4


Ignore:
Timestamp:
2009-09-29T11:25:01Z (6 years ago)
Author:
Xuefer
Message:

the logic of implemenation of dir/file path fixing was wrong. file/dir path should be cached before hardlink

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r666 r684  
    664664#endif
    665665    } while (0);
    666     IFRESTORE(`xc_fix_op_array_info(processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
     666    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
    667667
    668668#ifdef ZEND_ENGINE_2
     
    819819    DISPATCH(size_t, size)
    820820
    821     DISPATCH(int, filepath_len)
    822     IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
    823     DISPATCH(int, dirpath_len)
    824     IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
    825 #ifdef IS_UNICODE
    826     DISPATCH(int, ufilepath_len)
    827     IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
    828     DISPATCH(int, udirpath_len)
    829     IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
    830 #endif
    831 
    832821    IFRESTORE(`COPY(op_array_info)', `
    833822        STRUCT(xc_op_array_info_t, op_array_info)
     
    943932    DISPATCH(int, inode)
    944933#endif
     934
     935    DISPATCH(int, filepath_len)
     936    IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
     937    DISPATCH(int, dirpath_len)
     938    IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
     939#ifdef IS_UNICODE
     940    DISPATCH(int, ufilepath_len)
     941    IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
     942    DISPATCH(int, udirpath_len)
     943    IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
     944#endif
     945
    945946')
    946947dnl }}}
Note: See TracChangeset for help on using the changeset viewer.