Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 539320
Collapse All | Expand All

(-)file_not_specified_in_diff (-20 / +30 lines)
Line  Link Here
0
-- gpm-1.20.7/.gitignore
0
++ gpm-1.20.7-format-security/.gitignore
Lines 11-16 Makefile Link Here
11
Makefile.include
11
Makefile.include
12
/aclocal.m4
12
/aclocal.m4
13
/autom4te.cache
13
/autom4te.cache
14
/config.cache
14
/config.log
15
/config.log
15
/config.status
16
/config.status
16
/configure
17
/configure
Lines 29-35 Makefile.include Link Here
29
/src/gpm
30
/src/gpm
30
/src/gpm2/tmp
31
/src/gpm2/tmp
31
/src/gpm2/out
32
/src/gpm2/out
32
/src/lib/libgpm.so.*
33
/src/lib/libgpm.so*
33
/src/prog/disable-paste
34
/src/prog/disable-paste
34
/src/prog/display-buttons
35
/src/prog/display-buttons
35
/src/prog/display-coords
36
/src/prog/display-coords
36
-- gpm-1.20.7/src/headers/gpm.h
37
++ gpm-1.20.7-format-security/src/headers/gpm.h
Lines 280-289 int Gpm_GetSnapshot(Gpm_Event *ePtr); Link Here
280
char *Gpm_get_console( void );
280
char *Gpm_get_console( void );
281
int Gpm_x_high_y(int base, int pot_y);
281
int Gpm_x_high_y(int base, int pot_y);
282
int Gpm_cnt_digits(int number);
282
int Gpm_cnt_digits(int number);
283
void gpm_oops(int line, char *file, char *text, ... );
283
#ifdef __GNUC__
284
__attribute__((__format__(printf, 3, 4)))
285
#endif
286
void gpm_oops(int line, const char *file, const char *text, ... );
284
287
285
/* report.c / report-lib.c */
288
/* report.c / report-lib.c */
286
void gpm_report(int line, char *file, int stat, char *text, ... );
289
#ifdef __GNUC__
290
__attribute__((__format__(printf, 4, 5)))
291
#endif
292
void gpm_report(int line, const char *file, int stat, const char *text, ... );
287
293
288
#ifdef __cplusplus
294
#ifdef __cplusplus
289
  };
295
  };
290
-- gpm-1.20.7/src/headers/message.h
296
++ gpm-1.20.7-format-security/src/headers/message.h
Lines 226-232 Link Here
226
/* #define GPM_MESS_                   "" */
226
/* #define GPM_MESS_                   "" */
227
227
228
/* functions */
228
/* functions */
229
void gpm_report(int line, char *file, int stat, char *text, ... );
229
#ifdef __GNUC__
230
__attribute__((__format__(printf, 4, 5)))
231
#endif
232
void gpm_report(int line, const char *file, int stat, const char *text, ... );
230
233
231
/* rest of wd.h */
234
/* rest of wd.h */
232
#ifdef HAVE_SYSLOG_H
235
#ifdef HAVE_SYSLOG_H
233
-- gpm-1.20.7/src/lib/report-lib.c
236
++ gpm-1.20.7-format-security/src/lib/report-lib.c
Lines 24-32 Link Here
24
24
25
#include "headers/message.h"
25
#include "headers/message.h"
26
26
27
void gpm_report(int line, char *file, int stat, char *text, ... )
27
void gpm_report(int line, const char *file, int stat, const char *text, ... )
28
{
28
{
29
   char *string = NULL;
29
   const char *string = NULL;
30
   int log_level;
30
   int log_level;
31
   va_list ap;
31
   va_list ap;
32
32
Lines 47-53 void gpm_report(int line, char *file, in Link Here
47
                           log_level = LOG_CRIT; break;
47
                           log_level = LOG_CRIT; break;
48
   }
48
   }
49
#ifdef HAVE_VSYSLOG
49
#ifdef HAVE_VSYSLOG
50
   syslog(log_level, string);
50
   syslog(log_level, "%s", string);
51
   vsyslog(log_level, text, ap);
51
   vsyslog(log_level, text, ap);
52
#else
52
#else
53
   fprintf(stderr,"%s[%s(%d)]:\n",string,file,line);
53
   fprintf(stderr,"%s[%s(%d)]:\n",string,file,line);
54
-- gpm-1.20.7/src/prog/gpm-root.y
54
++ gpm-1.20.7-format-security/src/prog/gpm-root.y
Lines 443-448 void f__fix(struct passwd *pass) Link Here
443
}
443
}
444
444
445
/*---------------------------------------------------------------------*/
445
/*---------------------------------------------------------------------*/
446
#if 0
446
static int f_debug_one(FILE *f, Draw *draw)
447
static int f_debug_one(FILE *f, Draw *draw)
447
{
448
{
448
   DrawItem *ip;
449
   DrawItem *ip;
Lines 465-470 static int f_debug_one(FILE *f, Draw *dr Link Here
465
#undef LINE
466
#undef LINE
466
   return 0;
467
   return 0;
467
}
468
}
469
#endif
468
470
469
int f_debug(int mode, DrawItem *self, int uid)
471
int f_debug(int mode, DrawItem *self, int uid)
470
{
472
{
Lines 960-969 static inline void scr_dump(int fd, FILE Link Here
960
/*------------*/
962
/*------------*/
961
static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
963
static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
962
{
964
{
963
   int x,y, dumpfd;
965
   int dumpfd;
964
   char dumpname[20];
966
   char dumpname[20];
965
966
   x=buffer[2]; y=buffer[3];
967
   
967
   
968
   /* WILL NOT WORK WITH DEVFS! FIXME! */
968
   /* WILL NOT WORK WITH DEVFS! FIXME! */
969
   sprintf(dumpname,"/dev/vcsa%i",vc);
969
   sprintf(dumpname,"/dev/vcsa%i",vc);
970
-- gpm-1.20.7/src/prog/mouse-test.c
970
++ gpm-1.20.7-format-security/src/prog/mouse-test.c
Lines 182-195 Gpm_Type *(*I_serial)(int fd, unsigned s Link Here
182
/*----------------------------------------------------------------------------- 
182
/*----------------------------------------------------------------------------- 
183
   Place the description here.
183
   Place the description here.
184
 -----------------------------------------------------------------------------*/
184
 -----------------------------------------------------------------------------*/
185
int mousereopen(int oldfd, char *name, Gpm_Type *type)
185
int mousereopen(int oldfd, const char *name, Gpm_Type *type)
186
{
186
{
187
   int fd;
187
   int fd;
188
   if (!type) type=mice+1; /* ms */
188
   if (!type) type=mice+1; /* ms */
189
   close(oldfd);
189
   close(oldfd);
190
   usleep(100000);
190
   usleep(100000);
191
   fd=open(name,O_RDWR);
191
   fd=open(name,O_RDWR);
192
   if (fd < 0) gpm_report(GPM_PR_OOPS,name);
192
   if (fd < 0) gpm_report(GPM_PR_OOPS, "%s", name);
193
   (*I_serial)(fd,type->flags,type,1,&type->name); /* ms initialization */
193
   (*I_serial)(fd,type->flags,type,1,&type->name); /* ms initialization */
194
   return fd;
194
   return fd;
195
}
195
}
196
-- gpm-1.20.7/src/report.c
196
++ gpm-1.20.7-format-security/src/report.c
Lines 69-75 Link Here
69
 *
69
 *
70
 */
70
 */
71
71
72
void gpm_report(int line, char *file, int stat, char *text, ... )
72
void gpm_report(int line, const char *file, int stat, const char *text, ...)
73
{
73
{
74
   FILE *console = NULL;
74
   FILE *console = NULL;
75
   va_list ap, ap3;
75
   va_list ap, ap3;

Return to bug 539320