Changeset 3969 for neercs/trunk/src/lock.cTweet

Timestamp:

Nov 19, 2009, 5:26:53 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Massive indentation pass, could insert odd things, blame pterjan, he doesn't care.

File:

• neercs/trunk/src/lock.c (modified) (13 diffs)

neercs/trunk/src/lock.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -48 +48 @@
 
 #if defined USE_LOCK
-    if(!screen_list->locked) return 0;
-
-    if(c==0x08)      // BACKSPACE
-    {
-        if(screen_list->lock_offset)
-        {
-            screen_list->lockpass[screen_list->lock_offset-1] = 0;
+    if (!screen_list->locked)
+        return 0;
+
+    if (c == 0x08)              // BACKSPACE
+    {
+        if (screen_list->lock_offset)
+        {
+            screen_list->lockpass[screen_list->lock_offset - 1] = 0;
             screen_list->lock_offset--;
         }
     }
-    else if(c==0x0d) // RETURN
+    else if (c == 0x0d)         // RETURN
     {
         memset(screen_list->lockmsg, 0, 1024);
-        if(validate_lock(screen_list, getenv("USER"), screen_list->lockpass))
+        if (validate_lock(screen_list, getenv("USER"), screen_list->lockpass))
         {
             memset(screen_list->lockpass, 0, 1024);
@@ -77 +78 @@
     else
     {
-        if(screen_list->lock_offset < 1023)
+        if (screen_list->lock_offset < 1023)
         {
             screen_list->lockpass[screen_list->lock_offset++] = c;
-            screen_list->lockpass[screen_list->lock_offset]   = 0;
+            screen_list->lockpass[screen_list->lock_offset] = 0;
         }
     }
@@ -95 +96 @@
     caca_canvas_t *cv = screen_list->cv;
 
-    gethostname(buffer, sizeof(buffer)-1);
+    gethostname(buffer, sizeof(buffer) - 1);
 
     int w = 65, h = 20;
@@ -103 +104 @@
 
     caca_set_color_ansi(cv, CACA_BLUE, CACA_BLUE);
-    caca_fill_box(cv,
-                   x, y,
-                   w, h, '#');
+    caca_fill_box(cv, x, y, w, h, '#');
     caca_set_color_ansi(cv, CACA_DEFAULT, CACA_BLUE);
-    caca_draw_cp437_box(cv,
-                         x, y,
-                         w, h);
-
-    x+=2;
+    caca_draw_cp437_box(cv, x, y, w, h);
+
+    x += 2;
     y++;
     caca_printf(cv,
-                 (caca_get_canvas_width(cv) - strlen(PACKAGE_STRING " locked")) / 2,
-                 y-1,
-                 PACKAGE_STRING " locked");
-
-    caca_printf(cv, x, y++, "Please type in your password for %s@%s :", getenv("USER"), buffer);
-    y+=2;
-
-    x = (caca_get_canvas_width(cv)/2) - ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
+                (caca_get_canvas_width(cv) -
+                 strlen(PACKAGE_STRING " locked")) / 2, y - 1,
+                PACKAGE_STRING " locked");
+
+    caca_printf(cv, x, y++, "Please type in your password for %s@%s :",
+                getenv("USER"), buffer);
+    y += 2;
+
+    x = (caca_get_canvas_width(cv) / 2) -
+        ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
     caca_printf(cv, x, y, "Password : ");
-    x+=strlen("Password : ");
-    for(i=0; i<strlen(screen_list->lockpass); i++)
+    x += strlen("Password : ");
+    for (i = 0; i < strlen(screen_list->lockpass); i++)
     {
         caca_put_str(cv, x, y, "*");
@@ -131 +130 @@
 
 
-    if(strlen(screen_list->lockmsg))
-    {
-        x = ((caca_get_canvas_width(cv) - w) / 2) + (strlen(screen_list->lockmsg));
-        y+=2;
+    if (strlen(screen_list->lockmsg))
+    {
+        x = ((caca_get_canvas_width(cv) - w) / 2) +
+            (strlen(screen_list->lockmsg));
+        y += 2;
         caca_set_color_ansi(cv, CACA_RED, CACA_BLUE);
         caca_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
@@ -155 +155 @@
     for (i = 0; i < num_msg; ++i)
     {
-        switch(msg[i]->msg_style)
+        switch (msg[i]->msg_style)
         {
         case PAM_PROMPT_ECHO_ON:
@@ -164 +164 @@
         case PAM_ERROR_MSG:
             break;
-        default :
+        default:
             printf("Unknow message type from PAM\n");
             break;
@@ -179 +179 @@
 #if USE_LOCK
     int ret;
-    pam_handle_t *pamh=NULL;
+    pam_handle_t *pamh = NULL;
     char buffer[100];
-    const char *service="neercs";
+    const char *service = "neercs";
     struct pam_conv conv = {
         convpam,
@@ -188 +188 @@
 
     ret = pam_start(service, user, &conv, &pamh);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
         return 0;
     pam_set_item(pamh, PAM_RUSER, user);
 
-    ret = gethostname(buffer, sizeof(buffer)-1);
+    ret = gethostname(buffer, sizeof(buffer) - 1);
     if (ret)
     {
@@ -203 +203 @@
 
     ret = pam_set_item(pamh, PAM_RHOST, buffer);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
     {
         sprintf(screen_list->lockmsg, "Can't set hostname");
@@ -211 +211 @@
 
     ret = pam_authenticate(pamh, 0);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
     {
         sprintf(screen_list->lockmsg, "Can't authenticate");
@@ -223 +223 @@
     return 1;
 }
-