Skip to content

Commit

Permalink
test-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmalak
jmalak committed Jan 2, 2025
1 parent 4b4e451 commit 2ec09ee
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cmd/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
#include <portable.h>

/* Not available with TURBOC++ 1.0 or earlier: */
#if defined __GNUC__
#if defined(__GNUC__)
#define pause cmdpause
#elif ( (!defined(__WATCOMC__) && !defined(__TURBOC__)) || (__TURBOC__ > 0x297) )
#include <dirent.h>
Expand Down
6 changes: 3 additions & 3 deletions cmd/mkdir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "../include/misc.h"
#include "../include/lfnfuncs.h"

int recursive_mkdir(const char * path, int optRecursiveMode, int optQuiet)
int recursive_mkdir(const char * path, int recursiveMode, int quiet)
{
if (optRecursiveMode) {
if (recursiveMode) {
char fullname[MAXPATH];
char *p = fullname;
int flag_not_done = 0;
Expand All @@ -43,7 +43,7 @@ int recursive_mkdir(const char * path, int optRecursiveMode, int optQuiet)
ret = mkdir(fullname);
}
if (ret) {
if (!optQuiet) {
if (!quiet) {
/* TODO show error message */
}
return ret;
Expand Down
6 changes: 3 additions & 3 deletions cmd/rmdir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ int rmdir_withfiles(char * path, int maxlen)
return rmdir(path);
}

int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
int recursive_rmdir(const char * path, int recursiveMode, int quiet)
{
if (optRecursiveMode) {
if (recursiveMode) {
struct dos_ffblk f;
char fullname[MAXPATH + sizeof(f.ff_name) + 2], *p;
int len;
Expand Down Expand Up @@ -133,7 +133,7 @@ int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
*p = 0;

/* prompt user if they are sure, regardless if files or not */
if (!optQuiet) {
if (!quiet) {
int r;
r = userprompt(PROMPT_DELETE_ALL, fullname); /* Are you sure? TODO fix me */

Expand Down
2 changes: 1 addition & 1 deletion include/misc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ char *cwd(int drive);
char *abspath(const char * const fnam, const int warn);
char *truepath(const char * const fnam);
int changeDrive(int drive);
int mk_rd_dir(char *param, int (*func) (const char *, int optRecursiveMode, int optQuiet), char *fctname);
int mk_rd_dir(char *param, int (*func) (const char *, int recursiveMode, int quiet), char *fctname);
void cutBackslash(char * const s);
int cd_dir(char *param, int cdd, const char * const fctname);
enum OnOff onoffStr(char *line);
Expand Down
9 changes: 4 additions & 5 deletions lib/makefile.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ freecom.rsp : $(ECHOLIBDEP) makefile.mak
$(ECHOLIB) freecom.rsp $(OBJS35)
$(ECHOLIB) freecom.rsp $(OBJS36)

freecom_deps1 : $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) \
$(OBJS8) $(OBJS9) $(OBJS10) $(OBJS11) $(OBJS12) $(OBJS13) $(OBJS14) $(OBJS15) \
$(OBJS16) $(OBJS17) $(OBJS18)
freecom1_dep : $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) $(OBJS8) \
$(OBJS9) $(OBJS10) $(OBJS11) $(OBJS12) $(OBJS13) $(OBJS14) $(OBJS15) $(OBJS16) $(OBJS17)

freecom_deps2 : $(OBJS19) $(OBJS20) $(OBJS21) $(OBJS22) $(OBJS23) $(OBJS24) \
freecom2_dep : $(OBJS18) $(OBJS19) $(OBJS20) $(OBJS21) $(OBJS22) $(OBJS23) $(OBJS24) \
$(OBJS25) $(OBJS26) $(OBJS27) $(OBJS28) $(OBJS29) $(OBJS30) $(OBJS31) $(OBJS32) \
$(OBJS33) $(OBJS34) $(OBJS35) $(OBJS36)

freecom.lib : $(CFG) freecom_deps1 freecom_deps2 freecom.rsp
freecom.lib : $(CFG) freecom1_dep freecom2_dep freecom.rsp
$(RMFILES) freecom.lib
$(AR) freecom.lib @freecom.rsp $(LIBLIST) freecom.lst
2 changes: 1 addition & 1 deletion lib/mk_rddir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ optScanFct(opt_md_rd)
#define SCANNER_FCT 0
#endif

int mk_rd_dir(char *param, int (*func) (const char *, int optRecursiveMode, int optQuiet), char *fctname)
int mk_rd_dir(char *param, int (*func) (const char *, int recursiveMode, int quiet), char *fctname)
{ char **argv;
int argc, opts;
int rv;
Expand Down
4 changes: 2 additions & 2 deletions suppl/src/makefile.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OBJS6 = env_fora.obj env_free.obj env_insv.obj env_len.obj env_mtch.obj env_new.
OBJS7 = env_nost.obj env_ovrw.obj env_repl.obj env_rlsg.obj env_scnt.obj env_size.obj
OBJS8 = env_strg.obj env_sub.obj env_var1.obj env_var2.obj ffmaxbuf.obj fgetpos.obj
OBJS9 = fmemchr.obj fmemcmp.obj fmemcpy.obj fmemove.obj fnorm.obj fputmc.obj fstrcpy.obj
OBJS10 = fstrdup.obj fstrlen.obj _getdcwd.obj mcb_1st.obj mcb_is.obj mcb_leng.obj mcb_nxt.obj
OBJS10 = fstrdup.obj fstrlen.obj _getdcwd.obj mcb_1st.obj mcb_is.obj mcb_leng.obj mcb_nxt.obj
OBJS11 = mcb_walk.obj stpcat.obj stpcpy.obj toupperx.obj filefind.obj invokedo.obj intr.obj

DOBJS1 = app_ievx.obj app_ini_.obj app_name.obj app_namx.obj app_vars.obj dbgf_chg.obj
Expand All @@ -29,7 +29,7 @@ DOBJS5 = dbgf_mki.obj dbgf_ml.obj dbgf_pop.obj dbgf_prt.obj dbgf_psh.obj dbgf_va
DOBJS6 = dbgm_chk.obj dbgv_s0.obj dbgv_s2.obj dbgv_s3.obj dbgv_s4.obj dbgv_s5.obj
DOBJS7 = dbgv_s6.obj dbgv_s7.obj dbgv_s8.obj dbgv_s10.obj dbgv_s13.obj dbgv_s14.obj
DOBJS8 = dbgv_s15.obj dbgv_s17.obj dbgv_s19.obj dbgv_s20.obj dbgv_s22.obj dbgv_s25.obj
DOBJS9 = eeopen.obj eestrcon.obj env_sdup.obj erfc_00f.obj erfc_015.obj gm_res.obj
DOBJS9 = eeopen.obj eestrcon.obj env_sdup.obj erfc_00f.obj erfc_015.obj gm_res.obj
DOBJS10 = gm_dup.obj gm_chgm.obj gm_gtmem.obj nlstime.obj strnum.obj s_skipws.obj s_skipwd.obj

# Prepare Librarian Response File
Expand Down

0 comments on commit 2ec09ee

Please # to comment.