prepared release
This commit is contained in:
		
							parent
							
								
									1460b14f45
								
							
						
					
					
						commit
						75dd779245
					
				
							
								
								
									
										10
									
								
								config.mk
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								config.mk
									
									
									
									
									
								
							| @ -14,17 +14,15 @@ INCS = -I. -I/usr/include -I${X11INC} | |||||||
| LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext | LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext | ||||||
| 
 | 
 | ||||||
| # flags
 | # flags
 | ||||||
| CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"  -DHAVE_SHADOW_H | CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H | ||||||
| LDFLAGS = ${LIBS} | CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} | ||||||
| #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
 | LDFLAGS = -s ${LIBS} | ||||||
| #LDFLAGS = -g ${LIBS}
 |  | ||||||
| 
 | 
 | ||||||
| # On *BSD remove -DHAVE_SHADOW_H from CFLAGS and add -DHAVE_BSD_AUTH
 | # On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH
 | ||||||
| # On OpenBSD and Darwin remove -lcrypt from LIBS
 | # On OpenBSD and Darwin remove -lcrypt from LIBS
 | ||||||
| 
 | 
 | ||||||
| # compiler and linker
 | # compiler and linker
 | ||||||
| CC = cc | CC = cc | ||||||
| LD = ${CC} |  | ||||||
| 
 | 
 | ||||||
| # Install mode. On BSD systems MODE=2755 and GROUP=auth
 | # Install mode. On BSD systems MODE=2755 and GROUP=auth
 | ||||||
| # On others MODE=4755 and GROUP=root
 | # On others MODE=4755 and GROUP=root
 | ||||||
|  | |||||||
							
								
								
									
										7
									
								
								slock.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								slock.c
									
									
									
									
									
								
							| @ -22,7 +22,7 @@ | |||||||
| #include <bsd_auth.h> | #include <bsd_auth.h> | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| void | static void | ||||||
| die(const char *errstr, ...) { | die(const char *errstr, ...) { | ||||||
| 	va_list ap; | 	va_list ap; | ||||||
| 
 | 
 | ||||||
| @ -33,7 +33,7 @@ die(const char *errstr, ...) { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #ifndef HAVE_BSD_AUTH | #ifndef HAVE_BSD_AUTH | ||||||
| const char * | static const char * | ||||||
| get_password() { /* only run as root */ | get_password() { /* only run as root */ | ||||||
| 	const char *rval; | 	const char *rval; | ||||||
| 	struct passwd *pw; | 	struct passwd *pw; | ||||||
| @ -132,11 +132,12 @@ main(int argc, char **argv) { | |||||||
| 		if(ev.type == KeyPress) { | 		if(ev.type == KeyPress) { | ||||||
| 			buf[0] = 0; | 			buf[0] = 0; | ||||||
| 			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0); | 			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0); | ||||||
| 			if(IsKeypadKey(ksym))  | 			if(IsKeypadKey(ksym)) { | ||||||
| 				if(ksym == XK_KP_Enter) | 				if(ksym == XK_KP_Enter) | ||||||
| 					ksym = XK_Return; | 					ksym = XK_Return; | ||||||
| 				else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) | 				else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) | ||||||
| 					ksym = (ksym - XK_KP_0) + XK_0; | 					ksym = (ksym - XK_KP_0) + XK_0; | ||||||
|  | 			} | ||||||
| 			if(IsFunctionKey(ksym) || IsKeypadKey(ksym) | 			if(IsFunctionKey(ksym) || IsKeypadKey(ksym) | ||||||
| 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym) | 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym) | ||||||
| 					|| IsPrivateKeypadKey(ksym)) | 					|| IsPrivateKeypadKey(ksym)) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Anselm R Garbe
						Anselm R Garbe