X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a9f9e3d5387e31c404fd24ee71b2a72b005b85eb..fc5bc39368b0c7e05bb5c62a84c44e3bdcbbb1c2:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 436b1ec4..f0803d25 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -39,8 +39,6 @@ struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
  * static prototypes
  */
 static int match (char *, char *) PURE;
-static char *get_x400_friendly (char *, char *, int);
-static int get_x400_comp (char *, char *, char *, int);
 
 
 /*
@@ -357,50 +355,6 @@ static char *lmonth[] = { "January",  "February","March",   "April",
 			  "May",      "June",    "July",    "August",
 			  "September","October", "November","December" };
 
-static char *
-get_x400_friendly (char *mbox, char *buffer, int buffer_len)
-{
-    char given[BUFSIZ], surname[BUFSIZ];
-
-    if (mbox == NULL)
-	return NULL;
-    if (*mbox == '"')
-	mbox++;
-    if (*mbox != '/')
-	return NULL;
-
-    if (get_x400_comp (mbox, "/PN=", buffer, buffer_len)) {
-	for (mbox = buffer; (mbox = strchr(mbox, '.')); )
-	    *mbox++ = ' ';
-
-	return buffer;
-    }
-
-    if (!get_x400_comp (mbox, "/S=", surname, sizeof(surname)))
-	return NULL;
-
-    if (get_x400_comp (mbox, "/G=", given, sizeof(given)))
-	snprintf (buffer, buffer_len, "%s %s", given, surname);
-    else
-	snprintf (buffer, buffer_len, "%s", surname);
-
-    return buffer;
-}
-
-static int
-get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
-{
-    int	idx;
-    char *cp;
-
-    if ((idx = stringdex (key, mbox)) < 0
-	    || !(cp = strchr(mbox += idx + strlen (key), '/')))
-	return 0;
-
-    snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
-    return 1;
-}
-
 struct format *
 fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	  struct fmt_callbacks *callbacks)
@@ -579,20 +533,25 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	case FT_LS_ORDINAL:
 	    {
 		int digit = value % 10;
+		int seconddigit = (value / 10) % 10;
 		const char *suffix;
 
-		switch (digit) {
-		case 1:
-		    suffix = "st";
-		    break;
-		case 2:
-		    suffix = "nd";
-		    break;
-		case 3:
-		    suffix = "rd";
-		    break;
-		default:
+		if (seconddigit == 1) {
 		    suffix = "th";
+		} else {
+		    switch (digit) {
+		    case 1:
+			suffix = "st";
+			break;
+		    case 2:
+			suffix = "nd";
+			break;
+		    case 3:
+			suffix = "rd";
+			break;
+		    default:
+			suffix = "th";
+		    }
 		}
 
 		strncpy(buffer, suffix, sizeof(buffer));
@@ -970,8 +929,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 				break;
 	            }
                     str = memmove(buffer, str, strlen(str) + 1);
-	        } else if (!(str = get_x400_friendly (mn->m_mbox,
-				buffer, sizeof(buffer)))) {
+	        } else {
 	unfriendly:
 		  switch (mn->m_type) {
 		    case LOCALHOST: