int makedir(char *);
char *nmh_getpass(const char *);
char *norm_charmap(char *);
-char *new_fs(char *, char *, char *, char *);
+char *new_fs(char *, char *);
int peekc(FILE *ib);
int pidwait(pid_t, int);
int pidstatus(int, FILE *, char *);
/*
** prototypes for some routines in uip
*/
-int annotate(char *, char *, char *, int, int, int);
+int annotate(char *, char *, char *, int, int, int, int);
void annolist(char *, char *, char *, int);
void annopreserve(int);
int distout(char *, char *, char *);