Skip to content

fix issue #15 and few other #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix issue #15 and few other #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bb871e
fix issue #15 - all is PE after first PE
XakerTwo Feb 17, 2025
aad0f0b
fix typo in `.sh` that's cause first file passed as `HWID`
XakerTwo Feb 17, 2025
3d555b8
fix bug in the parser of the hwids argument
XakerTwo Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gencat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function usage_and_exit() {
EXEC_DIR=$( dirname $0 )

OUTPUT_CAT_FILE=-
HARDWARE_ID=windrbd
HARDWARE_IDS=windrbd
OS_STRING=7X64,8X64,_v100_X64
OS_ATTR=2:6.1,2:6.2,2:10.0
GEN_TIME="-T 230823140713Z"
Expand Down
26 changes: 14 additions & 12 deletions generate-cat-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ void parse_file_args(char **f_args, int f_count, char *os_attr, struct list_node
struct list_node *this_file;
struct a_file *file_data;
int fname_len;
bool is_pe = false;
bool is_pe;

*file = NULL;

Expand Down Expand Up @@ -1123,6 +1123,8 @@ void parse_file_args(char **f_args, int f_count, char *os_attr, struct list_node

is_pe = true;
}
else
is_pe = false;

this_file = malloc(sizeof(struct list_node) + sizeof(struct a_file));
if (this_file == NULL) {
Expand Down Expand Up @@ -1165,10 +1167,6 @@ void parse_file_args(char **f_args, int f_count, char *os_attr, struct list_node
//reverse order is based on observed cat files */ \
*hwid = malloc(sizeof(struct list_node) + sizeof(struct an_attribute_data)); \
if (*hwid == NULL) \
{ \
fatal(ERR_OOM); \
} \
if (*hwid == NULL) \
{ \
fatal(ERR_OOM); \
} \
Expand All @@ -1191,7 +1189,7 @@ void parse_file_args(char **f_args, int f_count, char *os_attr, struct list_node
hwid_data->value = hwid_begin; \
}

//note: it does modify hwids content (replace comma with null) and creates references to its particular parts
//note: it does modify hwids content (replace each comma, that comes 1st after hwid, with null) and creates references to its particular parts
int parse_hwids_arg(char *hwids, struct list_node **hwid)
{
struct list_node *hwid_last = NULL;
Expand All @@ -1201,13 +1199,17 @@ int parse_hwids_arg(char *hwids, struct list_node **hwid)

while (*hwids)
{
if (*hwids == ',' && hwids > hwid_begin)
if (*hwids == ',')
{
FUNC_CREATE_HWID_NODE();

//"cut" string to current hwid end
*hwids = '\0';
//update current position and move position of current hwid begin to it
//check if delimiter is NOT immediately after another one (empty entries must be skipped, delimiter is not allowed in the value)
if (hwids > hwid_begin)
{
FUNC_CREATE_HWID_NODE();

//"cut" string to current hwid end
*hwids = '\0';
}
//update current position AND move position of current hwid begin to it
hwid_begin = ++hwids;
}
else
Expand Down