Changeset 08f747e in mainline for uspace/srv

Timestamp:

2010-11-26T21:49:30Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8e423a2d, dac43be

Parents:

e4dbfda (diff), da55d5b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (2 diffs)
• bd/part/guid_part/guid_part.c (modified) (1 diff)
• bd/part/mbr_part/mbr_part.c (modified) (1 diff)
• bd/rd/rd.c (modified) (1 diff)
• clip/clip.c (modified) (1 diff)
• devman/devman.c (modified) (2 diffs)
• devman/main.c (modified) (5 diffs)
• devman/match.c (modified) (2 diffs)
• devmap/devmap.c (modified) (3 diffs)
• hid/console/console.c (modified) (2 diffs)
• hid/console/gcons.c (modified) (1 diff)
• hid/fb/serial_console.c (modified) (3 diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (2 diffs)
• hw/char/i8042/i8042.c (modified) (3 diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (4 diffs)
• hw/cir/fhc/fhc.c (modified) (1 diff)
• hw/netif/dp8390/dp8390.c (modified) (1 diff)
• hw/netif/dp8390/ne2000.c (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• net/il/arp/arp.c (modified) (1 diff)
• net/il/ip/ip.c (modified) (2 diffs)
• net/nil/eth/eth.c (modified) (2 diffs)
• net/nil/nildummy/nildummy.c (modified) (2 diffs)
• ns/task.c (modified) (1 diff)
• taskmon/taskmon.c (modified) (2 diffs)
• vfs/vfs_ops.c (modified) (10 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -113 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", (void *) ctl_physical,
+            (void *) cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -181 +182 @@
         }
 
-        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks);
 
         mbytes = d->blocks / (2 * 1024);

uspace/srv/bd/part/guid_part/guid_part.c

@@ -155 +155 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -206 +206 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }

uspace/srv/bd/rd/rd.c

@@ -230 +230 @@
         }
         
-        printf("%s: Found RAM disk at %p, %d bytes\n", NAME, rd_ph_addr, rd_size);
+        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
+            (void *) rd_ph_addr, rd_size);
         
         int rc = devmap_driver_register(NAME, rd_connection);

uspace/srv/clip/clip.c

@@ -172 +172 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }

uspace/srv/devman/devman.c

@@ -651 +651 @@
         
         /* Send the device to the driver. */
-        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
-            &answer);
+        devman_handle_t parent_handle;
+        if (node->parent) {
+                parent_handle = node->parent->handle;
+        } else {
+                parent_handle = 0;
+        }
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
+            parent_handle, &answer);
         
         /* Send the device's name to the driver. */
@@ -1022 +1028 @@
         
         size_t idx = get_new_class_dev_idx(cl);
-        asprintf(&dev_name, "%s%d", base_name, idx);
+        asprintf(&dev_name, "%s%zu", base_name, idx);
         
         return dev_name;

uspace/srv/devman/main.c

@@ -36 +36 @@
  */
 
+#include <inttypes.h>
 #include <assert.h>
 #include <ipc/services.h>
@@ -405 +406 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -418 +418 @@
         node_t *dev = find_dev_node(&device_tree, handle);
         if (dev == NULL) {
-                printf(NAME ": devman_forward error - no device with handle %x "
-                    "was found.\n", handle);
+                printf(NAME ": devman_forward error - no device with handle %" PRIun
+                    " was found.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -435 +435 @@
         
         if (driver == NULL) {
-                printf(NAME ": devman_forward error - the device is not in "
-                    "usable state.\n", handle);
+                printf(NAME ": devman_forward error - the device is not in %" PRIun
+                    " usable state.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -450 +450 @@
                 printf(NAME ": devman_forward: cound not forward to driver %s ",
                     driver->name);
-                printf("the driver's phone is %x).\n", driver->phone);
+                printf("the driver's phone is %" PRIun ").\n", driver->phone);
                 ipc_answer_0(iid, EINVAL);
                 return;

uspace/srv/devman/match.c

@@ -35 +35 @@
 #include "devman.h"
 
+/** Compute compound score of driver and device.
+ *
+ * @param driver Match id of the driver.
+ * @param device Match id of the device.
+ * @return Compound score.
+ * @retval 0 No match at all.
+ */
+static int compute_match_score(match_id_t *driver, match_id_t *device)
+{
+        if (str_cmp(driver->id, device->id) == 0) {
+                /*
+                 * The strings matches, return their score multiplied.
+                 */
+                return driver->score * device->score;
+        } else {
+                /*
+                 * Different strings, return zero.
+                 */
+                return 0;
+        }
+}
+
 int get_match_score(driver_t *drv, node_t *dev)
 {
@@ -44 +66 @@
         
         /*
-         * Find first matching pair.
+         * Go through all pairs, return the highest score obtainetd.
          */
+        int highest_score = 0;
+        
         link_t *drv_link = drv->match_ids.ids.next;
         while (drv_link != drv_head) {
-                link_t *dev_link = dev->match_ids.ids.next;
+                link_t *dev_link = dev_head->next;
                 while (dev_link != dev_head) {
                         match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
                         match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
-
-                        if (str_cmp(drv_id->id, dev_id->id) == 0) {
-                                /*
-                                 * We found a match.
-                                 * Return the score of the match.
-                                 */
-                                return drv_id->score * dev_id->score;
+                        
+                        int score = compute_match_score(drv_id, dev_id);
+                        if (score > highest_score) {
+                                highest_score = score;
                         }
 
                         dev_link = dev_link->next;
                 }
+                
                 drv_link = drv_link->next;
         }
         
-        return 0;
+        return highest_score;
 }
 

uspace/srv/devmap/devmap.c

@@ -555 +555 @@
         if (devmap_device_find_name(namespace->name, device->name) != NULL) {
                 printf("%s: Device '%s/%s' already registered\n", NAME,
-                    device->namespace, device->name);
+                    device->namespace->name, device->name);
                 devmap_namespace_destroy(namespace);
                 fibril_mutex_unlock(&devices_list_mutex);
@@ -1052 +1052 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -1111 +1110 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }

uspace/srv/hid/console/console.c

@@ -804 +804 @@
                         if (screenbuffer_init(&consoles[i].scr,
                             fb_info.cols, fb_info.rows) == NULL) {
-                                printf(NAME ": Unable to allocate screen buffer %u\n", i);
+                                printf(NAME ": Unable to allocate screen buffer %zu\n", i);
                                 return false;
                         }
@@ -813 +813 @@
                         
                         char vc[DEVMAP_NAME_MAXLEN + 1];
-                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
+                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
                         
                         if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {

uspace/srv/hid/console/gcons.c

@@ -157 +157 @@
                 
                 char data[5];
-                snprintf(data, 5, "%u", index + 1);
+                snprintf(data, 5, "%zu", index + 1);
                 
                 size_t i;

uspace/srv/hid/fb/serial_console.c

@@ -47 +47 @@
 #include <io/style.h>
 #include <str.h>
+#include <inttypes.h>
 #include <io/screenbuffer.h>
 
@@ -135 +136 @@
         
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
+        snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f",
+            row + 1, col + 1);
         serial_puts(control);
 }
@@ -253 +255 @@
 {
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);
+        snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row);
         serial_puts(control);
 }

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -50 +50 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_ts.h"
@@ -136 +137 @@
         ts->last_y = 0;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            ts->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) ts->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_ts_irq_handler);

uspace/srv/hw/char/i8042/i8042.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -201 +202 @@
         ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, inr_b);
 
         wait_ready();
@@ -262 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -48 +48 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_uart.h"
@@ -95 +96 @@
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n");
+                printf(NAME ": Unable to register device %s.\n",
+                    NAMESPACE "/" NAME);
                 return -1;
         }
@@ -134 +136 @@
                         break;
                 case CHAR_WRITE_BYTE:
-                        printf(NAME ": write %d to device\n",
+                        printf(NAME ": write %" PRIun " to device\n",
                             IPC_GET_ARG1(call));
                         s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
@@ -185 +187 @@
         uart->client_phone = -1;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            uart->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) uart->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_uart_irq_handler);

uspace/srv/hw/cir/fhc/fhc.c

@@ -129 +129 @@
         }
         
-        printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
+        printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys,
             fhc_uart_size);
         

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -1516 +1516 @@
         if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep))
         {
-                printf("%s: No ethernet card found at 0x%x\n", 
-                        dep->de_name, dep->de_base_port);
+                printf("%s: No ethernet card found at %#lx\n",
+                    dep->de_name, dep->de_base_port);
                 dep->de_mode= DEM_DISABLED;
                 return;

uspace/srv/hw/netif/dp8390/ne2000.c

@@ -267 +267 @@
         if (!debug)
         {
-                printf("%s: NE%d000 at %X:%d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_irq);
+                printf("%s: NE%d000 at %#lx:%d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_irq);
         }
         else
         {
                 printf("%s: Novell NE%d000 ethernet card at I/O address "
-                        "0x%X, memory size 0x%X, irq %d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_ramsize, dep->de_irq);
+                    "%#lx, memory size %#lx, irq %d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_ramsize, dep->de_irq);
         }
 }

uspace/srv/loader/main.c

@@ -411 +411 @@
                         break;
                 }
-                if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
-                    IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
+                if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
                         DPRINTF("Responding EINVAL to method %d.\n",
                             IPC_GET_METHOD(call));

uspace/srv/net/il/arp/arp.c

@@ -391 +391 @@
         device->packet_dimension.content = mtu;
         fibril_rwlock_write_unlock(&arp_globals.lock);
-        printf("arp - device %d changed mtu to %d\n\n", device_id, mtu);
+        printf("arp - device %d changed mtu to %zu\n\n", device_id, mtu);
         return EOK;
 }

uspace/srv/net/il/ip/ip.c

@@ -461 +461 @@
         
         if (ip_netif->packet_dimension.content < IP_MIN_CONTENT) {
-                printf("Maximum transmission unit %d bytes is too small, at "
+                printf("Maximum transmission unit %zu bytes is too small, at "
                     "least %d bytes are needed\n",
                     ip_netif->packet_dimension.content, IP_MIN_CONTENT);
@@ -502 +502 @@
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
 
-        printf("%s: Device %d changed MTU to %d\n", NAME, device_id, mtu);
+        printf("%s: Device %d changed MTU to %zu\n", NAME, device_id, mtu);
 
         return EOK;

uspace/srv/net/nil/eth/eth.c

@@ -315 +315 @@
                         device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -407 +407 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
+        printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
             "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,

uspace/srv/net/nil/nildummy/nildummy.c

@@ -175 +175 @@
                         device->mtu = NET_DEFAULT_MTU;
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
@@ -232 +232 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d, mtu: %d)\n",
+        printf("%s: Device registered (id: %d, service: %d, mtu: %zu)\n",
             NAME, device->device_id, device->service, device->mtu);
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);

uspace/srv/ns/task.c

@@ -262 +262 @@
         if (ht == NULL) {
                 /* No such task exists. */
-                retval = ENOENT;
-                goto out;
+                ipc_answer_0(callid, ENOENT);
+                return;
         }
 

uspace/srv/taskmon/taskmon.c

@@ -60 +60 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIu64, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
+        printf(NAME ": Task %" PRIu64 " fault in thread %p.\n", taskid,
+            (void *) thread);
 
         fname = "/app/taskdump";
@@ -72 +73 @@
         char *dump_fname;
 
-        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Executing %s -c %s -t %s\n", dump_fname, s_taskid);
+        printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid);
         rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
             NULL);
 #else
-        printf(NAME ": Executing %s -t %s\n", s_taskid);
+        printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
         rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
 #endif

uspace/srv/vfs/vfs_ops.c

@@ -55 +55 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t, aoff64_t);
+static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t,
+    aoff64_t);
 
 /**
@@ -250 +251 @@
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
 {
+        devmap_handle_t devmap_handle;
+
         /*
          * We expect the library to do the device-name to device-handle
@@ -255 +258 @@
          * in the request.
          */
-        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         
         /*
@@ -291 +294 @@
          */
         char *fs_name;
-        rc = async_data_write_accept((void **) &fs_name, true, 0, FS_NAME_MAXLEN,
-            0, NULL);
+        rc = async_data_write_accept((void **) &fs_name, true, 0,
+            FS_NAME_MAXLEN, 0, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -458 +461 @@
 
                 phone = vfs_grab_phone(mp_node->fs_handle);
-                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->devmap_handle,
-                    mp_node->index);
+                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT,
+                    mp_node->devmap_handle, mp_node->index);
                 vfs_release_phone(mp_node->fs_handle, phone);
                 if (rc != EOK) {
@@ -740 +743 @@
                 aid_t msg;
                 ipc_call_t answer;
-                msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->devmap_handle,
-                    file->node->index, &answer);
+                msg = async_send_2(fs_phone, VFS_OUT_CLOSE,
+                    file->node->devmap_handle, file->node->index, &answer);
                 
                 /* Wait for reply from the FS server. */
@@ -834 +837 @@
         ipc_call_t answer;
         if (read) {
-                if (file->append)
-                        file->pos = file->node->size;
-                
                 rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
                     file->node->devmap_handle, file->node->index, file->pos,
                     &answer);
         } else {
+                if (file->append)
+                        file->pos = file->node->size;
+                
                 rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
                     file->node->devmap_handle, file->node->index, file->pos,
@@ -888 +891 @@
 {
         int fd = (int) IPC_GET_ARG1(*request);
-        off64_t off =
-            (off64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
+        off64_t off = (off64_t) MERGE_LOUP32(IPC_GET_ARG2(*request),
+            IPC_GET_ARG3(*request));
         int whence = (int) IPC_GET_ARG4(*request);
         
@@ -903 +906 @@
         off64_t newoff;
         switch (whence) {
-                case SEEK_SET:
-                        if (off >= 0) {
-                                file->pos = (aoff64_t) off;
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_1(rid, EOK, off);
-                                return;
-                        }
-                        break;
-                case SEEK_CUR:
-                        if ((off >= 0) && (file->pos + off < file->pos)) {
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        if ((off < 0) && (file->pos < (aoff64_t) -off)) {
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        file->pos += off;
-                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
-                        
+        case SEEK_SET:
+                if (off >= 0) {
+                        file->pos = (aoff64_t) off;
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
-                        return;
-                case SEEK_END:
-                        fibril_rwlock_read_lock(&file->node->contents_rwlock);
-                        aoff64_t size = file->node->size;
-                        
-                        if ((off >= 0) && (size + off < size)) {
-                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        if ((off < 0) && (size < (aoff64_t) -off)) {
-                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        file->pos = size + off;
-                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
-                        
+                        ipc_answer_1(rid, EOK, off);
+                        return;
+                }
+                break;
+        case SEEK_CUR:
+                if ((off >= 0) && (file->pos + off < file->pos)) {
+                        fibril_mutex_unlock(&file->lock);
+                        ipc_answer_0(rid, EOVERFLOW);
+                        return;
+                }
+                
+                if ((off < 0) && (file->pos < (aoff64_t) -off)) {
+                        fibril_mutex_unlock(&file->lock);
+                        ipc_answer_0(rid, EOVERFLOW);
+                        return;
+                }
+                
+                file->pos += off;
+                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
+                
+                fibril_mutex_unlock(&file->lock);
+                ipc_answer_2(rid, EOK, LOWER32(newoff),
+                    UPPER32(newoff));
+                return;
+        case SEEK_END:
+                fibril_rwlock_read_lock(&file->node->contents_rwlock);
+                aoff64_t size = file->node->size;
+                
+                if ((off >= 0) && (size + off < size)) {
                         fibril_rwlock_read_unlock(&file->node->contents_rwlock);
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
-                        return;
+                        ipc_answer_0(rid, EOVERFLOW);
+                        return;
+                }
+                
+                if ((off < 0) && (size < (aoff64_t) -off)) {
+                        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                        fibril_mutex_unlock(&file->lock);
+                        ipc_answer_0(rid, EOVERFLOW);
+                        return;
+                }
+                
+                file->pos = size + off;
+                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
+                
+                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                fibril_mutex_unlock(&file->lock);
+                ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
+                return;
         }
         
@@ -977 +981 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        aoff64_t size =
-            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
+        aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(*request),
+            IPC_GET_ARG3(*request));
         int rc;