|
3 | 3 | ** OO_Copyright_BEGIN |
4 | 4 | ** |
5 | 5 | ** |
6 | | -** Copyright 2010, 2020 IBM Corp. All rights reserved. |
| 6 | +** Copyright 2010, 2025 IBM Corp. All rights reserved. |
7 | 7 | ** |
8 | 8 | ** Redistribution and use in source and binary forms, with or without |
9 | 9 | ** modification, are permitted provided that the following conditions |
|
49 | 49 |
|
50 | 50 | #include "libltfs/kmi_ops.h" |
51 | 51 | #include "libltfs/ltfs_fuse_version.h" |
52 | | -#include <fuse.h> |
53 | 52 | #include "key_format_ltfs.h" |
54 | | - |
| 53 | +#include <fuse.h> |
55 | 54 | #ifdef mingw_PLATFORM |
56 | | -#include "libltfs/arch/win/win_util.h" |
| 55 | +#include "arch/win/win_util.h" |
| 56 | + |
57 | 57 | #endif |
58 | 58 |
|
59 | 59 | struct kmi_simple_options_data { |
@@ -193,20 +193,20 @@ int simple_parse_opts(void *opt_args) |
193 | 193 | + strlen((char *) key[i].dk) + strlen(":") + strlen((char *) key[i].dki) + 1; |
194 | 194 |
|
195 | 195 | if (priv.dk_list) |
196 | | - priv.dk_list = realloc(priv.dk_list, dk_list_len); |
| 196 | + priv.dk_list = (unsigned char*)realloc(priv.dk_list, dk_list_len); |
197 | 197 | else |
198 | | - priv.dk_list = calloc(dk_list_len, sizeof(unsigned char)); |
| 198 | + priv.dk_list = (unsigned char*)calloc(dk_list_len, sizeof(unsigned char)); |
199 | 199 | if (priv.dk_list == NULL) { |
200 | 200 | ltfsmsg(LTFS_ERR, 10001E, __FUNCTION__); |
201 | 201 | return -LTFS_NO_MEMORY; |
202 | 202 | } |
203 | 203 | *(priv.dk_list + original_dk_list_len) = '\0'; |
204 | 204 |
|
205 | 205 | if (original_dk_list_len) |
206 | | - strcat((char *) priv.dk_list, "/"); |
207 | | - strcat((char *) priv.dk_list, (char *) key[i].dk); |
208 | | - strcat((char *) priv.dk_list, ":"); |
209 | | - strcat((char *) priv.dk_list, (char *) key[i].dki); |
| 206 | + arch_strcat((char *) priv.dk_list, dk_list_len, "/"); |
| 207 | + arch_strcat((char *) priv.dk_list, dk_list_len,(char *) key[i].dk); |
| 208 | + arch_strcat((char *) priv.dk_list, dk_list_len, ":"); |
| 209 | + arch_strcat((char *) priv.dk_list, dk_list_len,(char *) key[i].dki); |
210 | 210 | } |
211 | 211 |
|
212 | 212 | return 0; |
|
0 commit comments