summarylogtreecommitdiffstats
path: root/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
blob: 4d6882215bfeb5c2620ac8c42421cfeb6ecf672c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
--- hfaxd/Jobs.c++.Arch	2020-07-31 18:37:47.000000000 -0400
+++ hfaxd/Jobs.c++	2022-01-25 15:31:31.103951194 -0500
@@ -2252,11 +2252,17 @@ HylaFAXServer::Jprintf(FILE* fd, const c
 		break;
 	    case 'l':
 		fprintf(fd, fspec, job.pagelength);
 		break;
 	    case 'm':
-		fprintf(fd, fspec, (const char*) job.modem);
+		{
+		const char *q,*p=job.modemused;
+		if (*p == '\0') p=job.modem;
+		if (0==strcmp(p,"any")) p="";
+		q=strstr(p,"tty"); /* I'd rather search backwards */
+		fprintf(fd, fspec, q?(q+3):p);
+		}
 		break;
 	    case 'n':
 		fprintf(fd, fspec, " DQA"[job.notify]);
 		break;
 	    case 'o':