Ticket #34278: patch-getline_conflict_fix.diff

misc.c

@@ -26 +26 @@
 /* int interrupt() - handles interupts                             */
 /* show_nation(np) - displays a nation's characteristics           */
 /* free_nation_mark(wp,c) - tell us if the symbol is available     */
-/* getline(s,n) - read a line from stdin, remove \n                */
+/* getline_internal(s,n) - read a line from stdin, remove \n       */
 /* get_crypt_pass(prompt,s,w) - get password and encrypt           */
 /* critical() - while writing, don't bug me!!                      */
 /* noncritical() - normal operation                                */
@@ -161 +161 @@
   return 1;
 }
 
-void getline(char s[], int n)   /* read a line from stdin, remove \n */
+void getline_internal(char s[], int n)  /* read a line from stdin, remove \n */
 {
   fgets(s, n, stdin);
   if (s[strlen(s)-1] == '\n') { /* remove \n if it is there */

printmap.c

@@ -470 +470 @@
 
   read_world(&world, WORLD_FILE);
   fprintf(stderr, "Enter nation name: ");
-  getline(nation, NAMELEN);
+  getline_internal(nation, NAMELEN);
   user.id = get_nation_id(nation);
   get_crypt_pass("Your password: ", passwd, NULL, NULL);
   if (strcmp(world.nations[user.id].passwd, passwd)) {

proto.h

@@ -100 +100 @@
 int get_n_civil(Snation *np);
 int free_nation_mark(Sworld *wp, Symbol c);
 int get_n_soldiers(Snation *np);
-void getline(char s[], int n);
+void getline_internal(char s[], int n);
 void get_crypt_pass(char prompt[], char pass[], WINDOW *w, char def_pass[]);
 void cpass(Snation *np, char pass[]);
 int which_mark(int x, int y, Suser *up);

user.c

@@ -61 +61 @@
   if (!innation)
     {
       printf("which nation would you like to play? ");
-      getline(nation, NAMELEN);
+      getline_internal(nation, NAMELEN);
     }
   if ((user.id = get_nation_id(nation)) == -1) {
     printf ("\r\nnation does not exist, sorry\r\n");