From 2a6327d9783d87c09bb247de5644f10b96411ff6 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 23 May 2026 22:51:50 +0200 Subject: [PATCH] dostools flag --- flag.c | 68 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flag.c b/flag.c index 533a792..18f4c77 100644 --- a/flag.c +++ b/flag.c @@ -279,7 +279,7 @@ static void flag_help(void) fprintf(stdout, "SUB\n"); } -static int flag_attr_mask(char *s, unsigned *setbits, unsigned *clearbits) +static int flag_attr_mask(char *s, uint32 *setbits, uint32 *clearbits) { int set = 1; char *p = s; @@ -296,51 +296,51 @@ static int flag_attr_mask(char *s, unsigned *setbits, unsigned *clearbits) if (flag_same(p, "RO")) { if (set) { - *setbits |= (unsigned)(NWFA_RO | NWFA_DI | NWFA_RI); + *setbits |= (NWFA_RO | NWFA_DI | NWFA_RI); } else { - *clearbits |= (unsigned)(NWFA_RO | NWFA_DI | NWFA_RI); + *clearbits |= (NWFA_RO | NWFA_DI | NWFA_RI); } } else if (flag_same(p, "RW")) { - *clearbits |= (unsigned)(NWFA_RO | NWFA_DI | NWFA_RI); + *clearbits |= (NWFA_RO | NWFA_DI | NWFA_RI); } else if (flag_same(p, "S")) { - if (set) *setbits |= (unsigned)NWFA_S; - else *clearbits |= (unsigned)NWFA_S; + if (set) *setbits |= NWFA_S; + else *clearbits |= NWFA_S; } else if (flag_same(p, "H")) { - if (set) *setbits |= (unsigned)NWFA_H; - else *clearbits |= (unsigned)NWFA_H; + if (set) *setbits |= NWFA_H; + else *clearbits |= NWFA_H; } else if (flag_same(p, "SY") || flag_same(p, "SYS") || flag_same(p, "SYSTEM")) { - if (set) *setbits |= (unsigned)NWFA_SY; - else *clearbits |= (unsigned)NWFA_SY; + if (set) *setbits |= NWFA_SY; + else *clearbits |= NWFA_SY; } else if (flag_same(p, "T")) { - if (set) *setbits |= (unsigned)NWFA_T; - else *clearbits |= (unsigned)NWFA_T; + if (set) *setbits |= NWFA_T; + else *clearbits |= NWFA_T; } else if (flag_same(p, "P")) { - if (set) *setbits |= (unsigned)NWFA_P; - else *clearbits |= (unsigned)NWFA_P; + if (set) *setbits |= NWFA_P; + else *clearbits |= NWFA_P; } else if (flag_same(p, "A")) { - if (set) *setbits |= (unsigned)NWFA_A; - else *clearbits |= (unsigned)NWFA_A; + if (set) *setbits |= NWFA_A; + else *clearbits |= NWFA_A; } else if (flag_same(p, "RA")) { - if (set) *setbits |= (unsigned)NWFA_RA; - else *clearbits |= (unsigned)NWFA_RA; + if (set) *setbits |= NWFA_RA; + else *clearbits |= NWFA_RA; } else if (flag_same(p, "WA")) { - if (set) *setbits |= (unsigned)NWFA_WA; - else *clearbits |= (unsigned)NWFA_WA; + if (set) *setbits |= NWFA_WA; + else *clearbits |= NWFA_WA; } else if (flag_same(p, "CI")) { - if (set) *setbits |= (unsigned)NWFA_CI; - else *clearbits |= (unsigned)NWFA_CI; + if (set) *setbits |= NWFA_CI; + else *clearbits |= NWFA_CI; } else if (flag_same(p, "DI")) { - if (set) *setbits |= (unsigned)NWFA_DI; - else *clearbits |= (unsigned)NWFA_DI; + if (set) *setbits |= NWFA_DI; + else *clearbits |= NWFA_DI; } else if (flag_same(p, "RI")) { - if (set) *setbits |= (unsigned)NWFA_RI; - else *clearbits |= (unsigned)NWFA_RI; + if (set) *setbits |= NWFA_RI; + else *clearbits |= NWFA_RI; } else if (flag_same(p, "N") || flag_same(p, "NORMAL")) { - *clearbits |= (unsigned)(NWFA_RO | NWFA_H | NWFA_SY | NWFA_A | + *clearbits |= (NWFA_RO | NWFA_H | NWFA_SY | NWFA_A | NWFA_S | NWFA_T | NWFA_P | NWFA_RA | NWFA_WA | NWFA_CI | NWFA_DI | NWFA_RI); } else if (flag_same(p, "ALL")) { - *setbits |= (unsigned)(NWFA_RO | NWFA_H | NWFA_SY | NWFA_A | + *setbits |= (NWFA_RO | NWFA_H | NWFA_SY | NWFA_A | NWFA_S | NWFA_T | NWFA_P | NWFA_RA | NWFA_WA | NWFA_CI | NWFA_DI | NWFA_RI); } else { @@ -405,7 +405,7 @@ static int flag_list(char *pattern) if (flag_ncp87_obtain_attrs(ff.name, &nwattrs)) nwattrs = (uint32)ff.attrib; - flag_display_one(ff.name, (unsigned)nwattrs); + flag_display_one(ff.name, nwattrs); found++; } } while (!_dos_findnext(&ff)); @@ -413,7 +413,7 @@ static int flag_list(char *pattern) return(found); } -static int flag_apply(char *pattern, unsigned setbits, unsigned clearbits) +static int flag_apply(char *pattern, uint32 setbits, uint32 clearbits) { struct find_t ff; unsigned findattr = _A_RDONLY | _A_HIDDEN | _A_SYSTEM | _A_ARCH; @@ -438,7 +438,7 @@ static int flag_apply(char *pattern, unsigned setbits, unsigned clearbits) if (newattrs != attrs) { if (flag_ncp87_modify_attrs(fname, newattrs)) { - unsigned dosattr = (unsigned)(newattrs & (_A_RDONLY|_A_HIDDEN|_A_SYSTEM|_A_ARCH)); + unsigned dosattr = (newattrs & (_A_RDONLY|_A_HIDDEN|_A_SYSTEM|_A_ARCH)); if (_dos_setfileattr(fname, dosattr)) { fprintf(stderr, "You don't have rights to change : %s\n", fname); continue; @@ -449,7 +449,7 @@ static int flag_apply(char *pattern, unsigned setbits, unsigned clearbits) if (flag_ncp87_obtain_attrs(fname, &attrs)) attrs = newattrs; - flag_display_one(fname, (unsigned)attrs); + flag_display_one(fname, attrs); shown++; } while (!_dos_findnext(&ff)); @@ -461,8 +461,8 @@ int func_flag(int argc, char *argv[], int mode) { char *path = "*.*"; int i; - unsigned setbits = 0; - unsigned clearbits = 0; + uint32 setbits = 0; + uint32 clearbits = 0; int have_change = 0; int rc;