Merge remote-tracking branch 'origin/master'

exec/load/sbbsdefs.js

@@ -204,6 +204,7 @@ var   K_NOSPIN      =(1<<21);	/* Do not honor user's spinning cursor		*/
 var   K_ANSI_CPR	=(1<<22);	/* ANSI Cursor Position Report expected		*/
 var   K_TRIM        =(1<<23);   /* Trim white-space from both ends of str   */
 var   K_CTRLKEYS	=(1<<24);	/* No control-key handling/eating in inkey()*/
+var   K_NUL         =(1<<25);   /* Return null instead of "" upon timeout   */
 					    		/********************************************/
 
 						    	/********************************************/

src/smblib/smbtxt.c

@@ -589,7 +589,7 @@ uint8_t* smb_getattachment(smbmsg_t* msg, char* buf, char* filename, size_t file
 		if(filelen != NULL)
 			*filelen = strlen(buf);
 	}
-	return buf;
+	return (uint8_t*)buf;
 }
 
 /* Return number of file attachments contained in MIME-encoded message body */