diff options
author | Karl Berry <karl@freefriends.org> | 2006-12-07 22:46:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-12-07 22:46:13 +0000 |
commit | 06c5c638859d4cb20fe3201df1fa9ab6f216d4f0 (patch) | |
tree | 269cc6d6c475dc30b51ddf45465197d6620b7e1c /Build/source/texk/dvipsk/resident.c | |
parent | 954a067e3613a39197a4b981f5652c8fc3c25502 (diff) |
accumulated fixes from akira
git-svn-id: svn://tug.org/texlive/trunk@2613 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk/resident.c')
-rw-r--r-- | Build/source/texk/dvipsk/resident.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Build/source/texk/dvipsk/resident.c b/Build/source/texk/dvipsk/resident.c index 80610b02c90..e6644932fcd 100644 --- a/Build/source/texk/dvipsk/resident.c +++ b/Build/source/texk/dvipsk/resident.c @@ -92,7 +92,7 @@ extern Boolean shiftlowchars ; extern unsigned lastresortsizes[] ; extern integer hoff, voff ; extern struct papsiz *papsizes ; -extern Boolean secure ; +extern int secure ; extern integer hpapersize, vpapersize ; extern int landscape ; /* @@ -713,7 +713,7 @@ case 'E' : error("dvips was compiled with SECURE, which disables E in config") ; #else if (secure) { - error("dvips -R option used, which disables E in config") ; + error("E in config is disabled. To enable E, set z0 before E") ; break ; } (void)system(was_inline+1) ; @@ -759,10 +759,16 @@ case 'z' : if (secure_option && secure && was_inline[1] == '0') { fprintf (stderr, "warning: %s: z0 directive ignored since -R1 given\n", - realnameoffile); - } else { - secure = (was_inline[1] != '0') ; - } + realnameoffile); /* Never happen */ + } else { + if (was_inline[1] == '0') { + secure = 0 ; + } else if (was_inline[1] == '2') { + secure = 2 ; + } else { + secure = 1 ; + } + } break ; case 'q' : case 'Q' : quiet = (was_inline[1] != '0') ; |