Fixed lab10

new file:   .gitignore
	modified:   proglabs/lab10/func.c
	deleted:    proglabs/lab10/func.c~
	modified:   proglabs/lab10/main.c
	new file:   proglabs/lab10/prog
	new file:   proglabs/lab10/test/output.1_3
	new file:   proglabs/lab10/test/output.2_8
	new file:   proglabs/lab10/test/output.3_4
	modified:   proglabs/lab10/test/test.sh
This commit is contained in:
Павел Родионов
2025-12-05 14:35:13 +07:00
parent ac8a3f089d
commit 57d8354ffc
9 changed files with 81 additions and 590 deletions
+37 -31
View File
@@ -10,15 +10,6 @@ int main(int argc, char *argv[]){
for (int i = 0;i<XMAX;i++)x[i]=0;
for (int i = 0;i<QUERYMAX;i++)assist[i]=0;
if (
argc < 2/* ||(
str(argv[3],"-1")
)*/
) {
printf("Not enough arguments. (-help)\n");
return 1;
}
if(str(argv[1],"-help")||str(argv[1],"-h")){
printf("\nHelpMenu");
printf("\n\tprog [arg1] [arg2] [arg3]");
@@ -28,30 +19,45 @@ int main(int argc, char *argv[]){
return 0;
}
int swt=0;
if(str(argv[1],"1"))swt=1;
if(str(argv[1],"2"))swt=2;
if(str(argv[1],"3"))swt=3;
switch(swt){
case 1:
while(queryinput(x,&inquery,query)!=-1)
func1(argv,x,inquery,query);
x[32]=1;
func1(argv,x,inquery,query);
break;
case 2:
while(queryinput(x,&inquery,query)!=-1)
func2(argv,x,inquery,query,assist);
x[32]=1;
func2(argv,x,inquery,query,assist);
break;
case 3:
while(queryinput(x,&inquery,query)!=-1)
func3(argv,x,inquery,query);
break;
if (argc < 3){
printf("Not enough arguments. (-help)\n");
return 1;
}
printcount(x);
int swt=0;
if(((int)*argv[1])>='1' && ((int)*argv[1])<='3'){
swt = ((int)*argv[1]) - '0';
}
else{
printf("Wrong [arg1]\n");
return 1;
}
if(((int)*argv[2])>='0' && ((int)*argv[2])<='9'){
switch(swt){
case 1:
while(queryinput(x,&inquery,query)!=-1)
func1(argv,x,inquery,query);
x[32]=1;
func1(argv,x,inquery,query);
break;
case 2:
while(queryinput(x,&inquery,query)!=-1)
func2(argv,x,inquery,query,assist);
x[32]=1;
func2(argv,x,inquery,query,assist);
break;
case 3:
while(queryinput(x,&inquery,query)!=-1)
func3(argv,x,inquery,query);
break;
}
printcount(x);
}
else{
printf("Wrong [arg2]\n");
return 1;
}
return 0;
}