Skip to content

Commit

Permalink
""
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Lightfoot committed Jul 8, 2002
1 parent 54be3da commit ca95ab4
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
8 changes: 7 additions & 1 deletion driftnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/

static const char rcsid[] = "$Id: driftnet.c,v 1.24 2002/06/10 23:16:37 chris Exp $";
static const char rcsid[] = "$Id: driftnet.c,v 1.25 2002/07/08 20:57:17 chris Exp $";

#undef NDEBUG

Expand Down Expand Up @@ -466,7 +466,9 @@ int main(int argc, char *argv[]) {
struct bpf_program filter;
char ebuf[PCAP_ERRBUF_SIZE];
int c;
#ifndef NO_DISPLAY_WINDOW
extern char *savedimgpfx; /* in display.c */
#endif
extern char *audio_mpeg_player; /* in playaudio.c */
int newpfx = 0;
int mpeg_player_specified = 0;
Expand Down Expand Up @@ -522,10 +524,12 @@ int main(int argc, char *argv[]) {
tmpdir_specified = 1; /* so we don't delete it. */
break;

#ifndef NO_DISPLAY_WINDOW
case 'x':
savedimgpfx = optarg;
newpfx = 1;
break;
#endif

case '?':
default:
Expand Down Expand Up @@ -618,8 +622,10 @@ int main(int argc, char *argv[]) {
fprintf(stderr, PROGNAME": using filter expression `%s'\n", filterexpr);


#ifndef NO_DISPLAY_WINDOW
if (verbose && newpfx && !adjunct)
fprintf(stderr, PROGNAME": using saved image prefix `%s'\n", savedimgpfx);
#endif

setup_signals();

Expand Down
6 changes: 5 additions & 1 deletion gif.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
*/

static const char rcsid[] = "$Id: gif.c,v 1.3 2002/06/10 21:25:48 chris Exp $";
#ifndef NO_DISPLAY_WINDOW

static const char rcsid[] = "$Id: gif.c,v 1.4 2002/07/08 20:57:17 chris Exp $";

#include <gif_lib.h>

Expand Down Expand Up @@ -116,3 +118,5 @@ int gif_load_img(img I) {

return ret;
}

#endif /* !NO_DISPLAY_WINDOW */
7 changes: 6 additions & 1 deletion img.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
*/

static const char rcsid[] = "$Id: img.c,v 1.8 2002/06/10 21:25:48 chris Exp $";
#ifndef NO_DISPLAY_WINDOW

static const char rcsid[] = "$Id: img.c,v 1.9 2002/07/08 20:57:17 chris Exp $";

#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -286,4 +288,7 @@ void img_blt(img dest, const int dx, const int dy, img src, const int sx, const
/* Different images; simple copy. */
img_simple_blt(dest, destx, desty, src, srcx, srcy, width, height);
}

#endif

#endif /* !NO_DISPLAY_WINDOW */
6 changes: 5 additions & 1 deletion img.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
* Copyright (c) 2001 Chris Lightfoot. All rights reserved.
* Email: chris@ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
*
* $Id: img.h,v 1.6 2002/06/10 21:25:48 chris Exp $
* $Id: img.h,v 1.7 2002/07/08 20:57:17 chris Exp $
*
*/

#ifndef NO_DISPLAY_WINDOW

#ifndef __IMG_H_ /* include guard */
#define __IMG_H_

Expand Down Expand Up @@ -83,3 +85,5 @@ void img_delete(img I);
void img_simple_blt(img dest, const int dx, const int dy, img src, const int sx, const int sy, const int w, const int h);

#endif /* __IMG_H_ */

#endif /* !NO_DISPLAY_WINDOW */
6 changes: 5 additions & 1 deletion jpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
*/

static const char rcsid[] = "$Id: jpeg.c,v 1.4 2002/06/10 21:25:48 chris Exp $";
#ifndef NO_DISPLAY_WINDOW

static const char rcsid[] = "$Id: jpeg.c,v 1.5 2002/07/08 20:57:17 chris Exp $";

#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -162,3 +164,5 @@ int jpeg_save_img(const img I, FILE *fp) {

return 1;
}

#endif /* !NO_DISPLAY_WINDOW */

0 comments on commit ca95ab4

Please sign in to comment.