--- freem/src/expr.c	2025/03/09 19:14:24	1.5
+++ freem/src/expr.c	2025/03/24 01:32:22	1.9
@@ -1,5 +1,5 @@
 /*
- *   $Id: expr.c,v 1.5 2025/03/09 19:14:24 snw Exp $
+ *   $Id: expr.c,v 1.9 2025/03/24 01:32:22 snw Exp $
  *    expression parser
  *
  *  
@@ -24,6 +24,18 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: expr.c,v $
+ *   Revision 1.9  2025/03/24 01:32:22  snw
+ *   Guard declaration of time function in expr.c for portability
+ *
+ *   Revision 1.8  2025/03/22 04:47:18  snw
+ *   Silently truncate long names in STRING exprs when  evaluates to an obsolete MDC standard
+ *
+ *   Revision 1.7  2025/03/22 03:39:23  snw
+ *   Fix reverse query polyfill call-in from C side and make NAME exprs silently truncate long names in obsolete MDC dialects
+ *
+ *   Revision 1.6  2025/03/22 03:05:19  snw
+ *   Comply with X11-96/13 portable length of names
+ *
  *   Revision 1.5  2025/03/09 19:14:24  snw
  *   First phase of REUSE compliance and header reformat
  *
@@ -129,7 +141,7 @@
 #define GET               'Y'
 #define GETX              ':'
 
-#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__)
+#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__)
 long    time ();
 #endif
 void cond_round (char *a, int digits);
@@ -173,6 +185,15 @@ void expr (short extyp)
     volatile int ch = 0;
     
     short   group;          /* flag to scan grouped patterns */
+
+    int  max_namlen = 255;
+
+    if ((rtn_dialect () == D_MDS) || (rtn_dialect () == D_M5) || (rtn_dialect () == D_FREEM)) {
+        max_namlen = 255;
+    }
+    else {
+        max_namlen = 8;
+    }
     
 #ifdef DEBUG_NEWPTR
     int loop;
@@ -201,14 +222,36 @@ void expr (short extyp)
                       (((ch == '/' && varnam[i - 1] != '/') ||
                         (ch == '%' && varnam[i - 1] == '/')) &&
                        (varnam[1] == '.' || varnam[1] == '/'))))) || (f != '^') && (ch == '.')) {
-                
-                varnam[i++] = ch;
 
-                
+                if ((i + 1) <= max_namlen) {
+                    varnam[i++] = ch;
+                }
+                else {
+                    if ((rtn_dialect () == D_M77) ||
+                        (rtn_dialect () == D_M84) ||
+                        (rtn_dialect () == D_M90) ||
+                        (rtn_dialect () == D_M95)) {
+                        /* silently truncate... yeah, the standard is stupid af */
+                        continue;
+                    }
+                    else {
+                        merr_raise (M56);
+                        return;
+                    }
+                }                
                 
             }
 
-            varnam[i] = EOL;            
+            varnam[i] = EOL;
+
+            #if 0
+            {
+                char gooby[256];
+                stcpy (gooby, varnam);
+                stcnv_m2c (gooby);
+                printf ("name = '%s'\r\n", gooby);
+            }
+            #endif
             
             if (ch == '(') {        /* it's an array */
                 
@@ -329,8 +372,23 @@ scan_name:
                     merr_raise (INVEXPR);
                     return;
                 }
-                
-                varnam[i++] = ch;
+
+                if ((i + 1) <= max_namlen) {
+                    varnam[i++] = ch;
+                }
+                else {
+                    if ((rtn_dialect () == D_M77) ||
+                        (rtn_dialect () == D_M84) ||
+                        (rtn_dialect () == D_M90) ||
+                        (rtn_dialect () == D_M95)) {
+                        /* silently truncate... yeah, the standard is stupid af */
+                        continue;
+                    }
+                    else {
+                        merr_raise (M56);
+                        return;
+                    }
+                }                
 
                 lastch = ch;
             }
@@ -346,7 +404,24 @@ scan_name:
         else {          /* local variable name */
 
             while (isalnum (ch = *++codptr)) {
-                varnam[i++] = ch;
+                
+                if ((i + 1) <= max_namlen) {
+                    varnam[i++] = ch;
+                }
+                else {
+                    if ((rtn_dialect () == D_M77) ||
+                        (rtn_dialect () == D_M84) ||
+                        (rtn_dialect () == D_M90) ||
+                        (rtn_dialect () == D_M95)) {
+                        /* silently truncate... yeah, the standard is stupid af */
+                        continue;
+                    }
+                    else {
+                        merr_raise (M56);
+                        return;
+                    }
+                }                
+                
             }
         
             varnam[i] = EOL;
@@ -2219,7 +2294,7 @@ f20:
                         stcnv_c2m (qryarg_ext);
 
                         /* put the $QUERY argument into the local variable %INT.REVQ */
-                        symtab (set_sym, "%INT.REVQ\201\201", qryarg_ext);
+                        symtab (set_sym, "%INTREVQ\201\201", qryarg_ext);
 
                         /* set up for calling into polyfill wrapper */
                         code[0] = '\201';