@@ -1033,8 +1033,8 @@ impl Dir {
1033
1033
}
1034
1034
1035
1035
pub fn symlink < P : AsRef < Path > , Q : AsRef < Path > > ( & self , original : P , link : Q ) -> io:: Result < ( ) > {
1036
- run_path_with_utf16 ( original . as_ref ( ) , & |orig | {
1037
- self . symlink_native ( orig , link . as_ref ( ) , original . as_ref ( ) . is_relative ( ) )
1036
+ run_path_with_utf16 ( link . as_ref ( ) , & |l | {
1037
+ self . symlink_native ( original . as_ref ( ) , l . as_ref ( ) , link . as_ref ( ) . is_relative ( ) )
1038
1038
} )
1039
1039
}
1040
1040
@@ -1197,32 +1197,34 @@ impl Dir {
1197
1197
const TOO_LONG_ERR : io:: Error =
1198
1198
io:: const_error!( io:: ErrorKind :: InvalidFilename , "File name is too long" ) ;
1199
1199
let mut opts = OpenOptions :: new ( ) ;
1200
- opts. write ( true ) ;
1201
- let linkfile = File :: open ( link, & opts) ?;
1202
- let utf16: Vec < u16 > = original. iter ( ) . chain ( original) . copied ( ) . collect ( ) ;
1200
+ opts. create ( true ) ;
1201
+ let linkfile = self . open_with ( link, & opts) ?;
1203
1202
let file_name_len = u16:: try_from ( original. len ( ) ) . or ( Err ( TOO_LONG_ERR ) ) ?;
1204
1203
let sym_buffer = c:: SYMBOLIC_LINK_REPARSE_BUFFER {
1205
1204
SubstituteNameOffset : 0 ,
1206
1205
SubstituteNameLength : file_name_len,
1207
- PrintNameOffset : file_name_len ,
1206
+ PrintNameOffset : 0 ,
1208
1207
PrintNameLength : file_name_len,
1209
1208
Flags : if relative { c:: SYMLINK_FLAG_RELATIVE } else { 0 } ,
1210
1209
PathBuffer : 0 ,
1211
1210
} ;
1212
- let layout = Layout :: new :: < c :: REPARSE_DATA_BUFFER > ( ) ;
1213
- let layout = layout
1214
- . extend ( Layout :: new :: < c:: SYMBOLIC_LINK_REPARSE_BUFFER > ( ) )
1215
- . or ( Err ( TOO_LONG_ERR ) ) ?
1216
- . 0 ;
1217
- let layout = Layout :: array :: < u16 > ( original . len ( ) * 2 )
1218
- . and_then ( |arr| layout . extend ( arr ) )
1219
- . or ( Err ( TOO_LONG_ERR ) ) ?
1220
- . 0 ;
1211
+ let layout = Layout :: from_size_align (
1212
+ size_of :: < c :: REPARSE_DATA_BUFFER > ( )
1213
+ + size_of :: < c:: SYMBOLIC_LINK_REPARSE_BUFFER > ( )
1214
+ + size_of :: < u16 > ( ) * ( original . len ( ) - 1 ) ,
1215
+ align_of :: < c :: REPARSE_DATA_BUFFER > ( )
1216
+ . max ( align_of :: < c :: SYMBOLIC_LINK_REPARSE_BUFFER > ( ) )
1217
+ . max ( align_of :: < u16 > ( ) ) ,
1218
+ )
1219
+ . or ( Err ( TOO_LONG_ERR ) ) ? ;
1221
1220
let buffer = unsafe { alloc ( layout) } . cast :: < c:: REPARSE_DATA_BUFFER > ( ) ;
1222
1221
unsafe {
1223
1222
buffer. write ( c:: REPARSE_DATA_BUFFER {
1224
1223
ReparseTag : c:: IO_REPARSE_TAG_SYMLINK ,
1225
- ReparseDataLength : u16:: try_from ( size_of_val ( & sym_buffer) ) . or ( Err ( TOO_LONG_ERR ) ) ?,
1224
+ ReparseDataLength : u16:: try_from (
1225
+ size_of :: < c:: SYMBOLIC_LINK_REPARSE_BUFFER > ( ) + usize:: from ( file_name_len) ,
1226
+ )
1227
+ . or ( Err ( TOO_LONG_ERR ) ) ?,
1226
1228
Reserved : 0 ,
1227
1229
rest : ( ) ,
1228
1230
} ) ;
@@ -1231,20 +1233,23 @@ impl Dir {
1231
1233
. cast :: < c:: SYMBOLIC_LINK_REPARSE_BUFFER > ( )
1232
1234
. write ( sym_buffer) ;
1233
1235
ptr:: copy_nonoverlapping (
1234
- utf16 . as_ptr ( ) ,
1236
+ original . as_ptr ( ) ,
1235
1237
buffer
1236
1238
. add ( offset_of ! ( c:: REPARSE_DATA_BUFFER , rest) )
1237
1239
. add ( offset_of ! ( c:: SYMBOLIC_LINK_REPARSE_BUFFER , PathBuffer ) )
1238
1240
. cast :: < u16 > ( ) ,
1239
- original. len ( ) * 2 ,
1241
+ original. len ( ) ,
1240
1242
) ;
1241
1243
} ;
1242
1244
let result = unsafe {
1243
1245
c:: DeviceIoControl (
1244
1246
linkfile. handle . as_raw_handle ( ) ,
1245
1247
c:: FSCTL_SET_REPARSE_POINT ,
1246
1248
& raw const buffer as * const c_void ,
1247
- u32:: try_from ( size_of_val ( & buffer) ) . or ( Err ( TOO_LONG_ERR ) ) ?,
1249
+ u32:: try_from (
1250
+ size_of :: < c:: SYMBOLIC_LINK_REPARSE_BUFFER > ( ) + usize:: from ( file_name_len) ,
1251
+ )
1252
+ . or ( Err ( TOO_LONG_ERR ) ) ?,
1248
1253
ptr:: null_mut ( ) ,
1249
1254
0 ,
1250
1255
ptr:: null_mut ( ) ,
0 commit comments