d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Treatment of -R flag is altered.

Browse source 
1 - if recognized by mapflag and not by Ack internally no
    complaint is given.
2 - If recognized by both mapflag and internally:
       -R....-.... : effectuate only mapflag command
       otherwise   : effectuate both.
3 - If not recognized at all, give a warning message and
    pass the flag to the linker.
This commit is contained in:
keie 1984-11-26 17:14:17 +00:00
parent 3c2c03165b
commit 4a36e98f5c
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/ack/main.c
View file

@ -198,7 +198,7 @@ vieuwargs(argc,argv) char **argv ; {
break ; break ;
case 't': t_flag++ ; case 't': t_flag++ ;
break ; break ;
case 'R': do_Rflag(argp); eaten=1; case 'R': eaten=1;
break ; break ;
case 'r': if ( argp[2]!=SUFCHAR ) { case 'r': if ( argp[2]!=SUFCHAR ) {
error("-r must be followed by %c",SUFCHAR) ; error("-r must be followed by %c",SUFCHAR) ;
@ -234,7 +234,11 @@ vieuwargs(argc,argv) char **argv ; {
if ( !hide ) { if ( !hide ) {
register char *tokeep ; register char *tokeep ;
tokeep=keeps(argp) ; tokeep=keeps(argp) ;
if ( argp[1]=='R' ) {
do_Rflag(tokeep);
} else {
*tokeep |= NO_SCAN ; *tokeep |= NO_SCAN ;
}
l_add(&flags,tokeep) ; l_add(&flags,tokeep) ;
} }
if ( argp[2] && !eaten ) { if ( argp[2] && !eaten ) {

26
util/ack/trans.c
View file

@ -163,21 +163,20 @@ transini() {
register list_elem *elem ; register list_elem *elem ;
register trf *phase ; register trf *phase ;
scanlist(l_first(R_list), elem) {
set_Rflag(l_content(*elem)) ;
}
l_clear(&R_list) ;
scanlist(l_first(tr_list), elem) { scanlist(l_first(tr_list), elem) {
phase = t_cont(*elem) ; phase = t_cont(*elem) ;
if ( !phase->t_linker ) getmapflags(phase); if ( !phase->t_linker ) getmapflags(phase);
} }
scanlist(l_first(R_list), elem) {
set_Rflag(l_content(*elem)) ;
}
l_clear(&R_list) ;
setpvar(keeps(NEEDS),needvar) ; setpvar(keeps(NEEDS),needvar) ;
setpvar(keeps(HEAD),headvar) ; setpvar(keeps(HEAD),headvar) ;
setpvar(keeps(TAIL),tailvar) ; setpvar(keeps(TAIL),tailvar) ;
} }
set_Rflag(argp) register char *argp ; { set_Rflag(argp) register char *argp ; {
int seen ;
register char *eos ; register char *eos ;
register list_elem *prog ; register list_elem *prog ;
register int length ; register int length ;
@ -192,23 +191,30 @@ set_Rflag(argp) register char *argp ; {
if ( eq && eq<eos ) eos= eq ; if ( eq && eq<eos ) eos= eq ;
} }
if ( colon && ( !eos || eos>colon ) ) eos= colon ; if ( colon && ( !eos || eos>colon ) ) eos= colon ;
if ( !eos ) fuerror("Incorrect use of -R flag") ; if ( !eos ) {
if ( !(argp[0]&NO_SCAN) ) werror("Incorrect use of -R flag") ;
return ;
}
length= eos - &argp[2] ; length= eos - &argp[2] ;
seen=NO ;
scanlist(l_first(tr_list), prog) { scanlist(l_first(tr_list), prog) {
if ( strncmp(t_cont(*prog)->t_name, &argp[2], length )==0 ) { if ( strncmp(t_cont(*prog)->t_name, &argp[2], length )==0 &&
t_cont(*prog)->t_name[length]==0 /* Same name length */) {
if ( *eos=='-' ) { if ( *eos=='-' ) {
if ( !(argp[0]&NO_SCAN) ) {
/* If not already taken by a mapflag */
l_add(&(t_cont(*prog)->t_flags),eos) ; l_add(&(t_cont(*prog)->t_flags),eos) ;
}
} else } else
if ( *eos=='=' ) { if ( *eos=='=' ) {
t_cont(*prog)->t_prog= eos+1 ; t_cont(*prog)->t_prog= eos+1 ;
} else { } else {
t_cont(*prog)->t_priority= atoi(eos+1) ; t_cont(*prog)->t_priority= atoi(eos+1) ;
} }
seen=YES ; argp[0] |= NO_SCAN ;
return ;
} }
} }
if ( !seen ) error("Cannot find program for %s",argp) ; if ( !(argp[0]&NO_SCAN) ) werror("Cannot find program for %s",argp) ;
return ; return ;
} }