@@ -52,8 +52,8 @@ pub mod identity {
52
52
use std:: borrow:: Cow ;
53
53
use std:: path:: Path ;
54
54
55
- fn err ( msg : & str ) -> std:: io:: Error {
56
- std:: io:: Error :: new ( std:: io:: ErrorKind :: Other , msg)
55
+ fn err ( msg : impl Into < String > ) -> std:: io:: Error {
56
+ std:: io:: Error :: new ( std:: io:: ErrorKind :: Other , msg. into ( ) )
57
57
}
58
58
59
59
pub fn is_path_owned_by_current_user ( path : Cow < ' _ , Path > ) -> std:: io:: Result < bool > {
@@ -75,12 +75,12 @@ pub mod identity {
75
75
. map_err ( |_| err ( "Failed to open process token" ) ) ?;
76
76
77
77
let mut len = 0_u32 ;
78
- if Security :: GetTokenInformation ( & handle, Security :: TokenUser , std:: ptr:: null_mut ( ) , 0 , & mut len)
78
+ if ! Security :: GetTokenInformation ( handle, Security :: TokenUser , std:: ptr:: null_mut ( ) , 0 , & mut len)
79
79
. as_bool ( )
80
80
{
81
81
let mut token_user = Security :: TOKEN_USER :: default ( ) ;
82
82
if Security :: GetTokenInformation (
83
- & handle,
83
+ handle,
84
84
Security :: TokenUser ,
85
85
& mut token_user as * mut _ as * mut std:: ffi:: c_void ,
86
86
len,
@@ -113,16 +113,16 @@ pub mod identity {
113
113
if res == ERROR_SUCCESS . 0 && Security :: IsValidSid ( path_sid) . as_bool ( ) {
114
114
is_owned = Security :: EqualSid ( path_sid, token_user. User . Sid ) . as_bool ( ) ;
115
115
} else {
116
- err_msg = "couldn't get owner for path or it wasn't valid" . into ( ) ;
116
+ err_msg = format ! ( "couldn't get owner for path or it wasn't valid: {}" , res ) . into ( ) ;
117
117
}
118
118
} else {
119
- err_msg = "owner id of current process wasn't set or valid" . into ( ) ;
119
+ err_msg = String :: from ( "owner id of current process wasn't set or valid" ) . into ( ) ;
120
120
}
121
121
} else {
122
- err_msg = "Could not get information about the token user" . into ( ) ;
122
+ err_msg = String :: from ( "Could not get information about the token user" ) . into ( ) ;
123
123
}
124
124
} else {
125
- err_msg = "Could not get token information for length of token user" . into ( ) ;
125
+ err_msg = String :: from ( "Could not get token information for length of token user" ) . into ( ) ;
126
126
}
127
127
CloseHandle ( handle) ;
128
128
if !descriptor. is_invalid ( ) {
0 commit comments