Unified · Split
| @@ -54,7 +54,7 @@ threadmain(int argc, char **argv) · 53 unmodified lines | |||
| 54 | Biobuf *b; | 54 | Biobuf *b; |
| 55 | Stream *s; | 55 | Stream *s; |
| 56 | Pdf *pdf; | 56 | Pdf *pdf; |
| 57 | int i, n, k; | 57 | int i, n, k, nodump; |
| 58 | 58 | ||
| 59 | quotefmtinstall(); | 59 | quotefmtinstall(); |
| 60 | inflateinit(); | 60 | inflateinit(); |
| @@ -63,6 +63,8 @@ threadmain(int argc, char **argv) · 2 unmodified lines | |||
| 63 | default: | 63 | default: |
| 64 | usage(); | 64 | usage(); |
| 65 | }ARGEND | 65 | }ARGEND |
| 66 | |||
| 67 | nodump = 0; | ||
| 66 | 68 | ||
| 67 | if(argc < 1) | 69 | if(argc < 1) |
| 68 | usage(); | 70 | usage(); |
| @@ -84,9 +86,11 @@ threadmain(int argc, char **argv) · 15 unmodified lines | |||
| 84 | break; | 86 | break; |
| 85 | }else if(argv[i][0] == '"' && argv[i][1] == 0 && v->type == Odict && strcmp(dictget(v, "Type")->name, "Page") == 0){ | 87 | }else if(argv[i][0] == '"' && argv[i][1] == 0 && v->type == Odict && strcmp(dictget(v, "Type")->name, "Page") == 0){ |
| 86 | dumppage(v); | 88 | dumppage(v); |
| 89 | nodump = 1; | ||
| 87 | break; | 90 | break; |
| 88 | }else if(argv[i][0] == '"' && argv[i][1] == 0 && v->type == Odict && strcmp(dictget(v, "Type")->name, "Pages") == 0){ | 91 | }else if(argv[i][0] == '"' && argv[i][1] == 0 && v->type == Odict && strcmp(dictget(v, "Type")->name, "Pages") == 0){ |
| 89 | dumppages(v); | 92 | dumppages(v); |
| 93 | nodump = 1; | ||
| 90 | break; | 94 | break; |
| 91 | }else if(argv[i][0] == '*' && argv[i][1] == 0 && v->type == Odict){ | 95 | }else if(argv[i][0] == '*' && argv[i][1] == 0 && v->type == Odict){ |
| 92 | for(k = 0; k < v->dict.nkv; k++) | 96 | for(k = 0; k < v->dict.nkv; k++) |
| @@ -108,7 +112,8 @@ threadmain(int argc, char **argv) · 15 unmodified lines | |||
| 108 | v = dictget(v, argv[i]); | 112 | v = dictget(v, argv[i]); |
| 109 | } | 113 | } |
| 110 | } | 114 | } |
| 111 | if(v == &null) | 115 | if(nodump){} |
| 116 | else if(v == &null) | ||
| 112 | fprint(2, "%r\n"); | 117 | fprint(2, "%r\n"); |
| 113 | else if(v != nil) | 118 | else if(v != nil) |
| 114 | print("%O\n", v); | 119 | print("%O\n", v); |