On Sun, Feb 28, 2016 at 09:55:37AM -0600, Chris Bennett wrote: > This moves essentially identical ckqueue functions out of lpd.c and > lpq.c into common_source/common.c. > Builds without errors on i386. lpq and lpd work afterwards >
ok tb@ modulo two comments: > > Index: lp.h > =================================================================== > RCS file: /cvs/src/usr.sbin/lpr/common_source/lp.h,v > retrieving revision 1.20 > diff -u -p -r1.20 lp.h > --- lp.h 12 Jan 2016 23:35:13 -0000 1.20 > +++ lp.h 28 Feb 2016 15:33:44 -0000 > @@ -126,6 +126,7 @@ int get_line(FILE *); > int getport(char *, int); > int getq(struct queue ***); > int safe_open(const char *, int, mode_t); > +int ckqueue(char *); please keep these prototypes sorted alphabetically cat'ed diffs like this are a pain to apply. Please go to a common parent directory and cvs diff from there. then it is possible to apply the patch in one go. Something like $ cd /usr/src $ cvs diff usr.sbin/lpr > /tmp/mypatch should do the trick.
